[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111295: Fixes: debbugs:13797

[Andreas Schwab]

------------------------------------------------------------
revno: 111295
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2013-02-24 09:09:24 +0100
message:
  Fixes: debbugs:13797
  
  * xdisp.c (set_message): Only check for debug-on-message if STRING
  is a string.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-24 00:21:06 +0000
+++ b/src/ChangeLog     2013-02-24 08:09:24 +0000
@@ -1,3 +1,8 @@
+2013-02-24  Andreas Schwab  <address@hidden>
+
+       * xdisp.c (set_message): Only check for debug-on-message if STRING
+       is a string.  (Bug#13797)
+
 2013-02-24  Paul Eggert  <address@hidden>
 
        Fix regression introduced by July 10 filelock.c patch.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-02-18 16:34:09 +0000
+++ b/src/xdisp.c       2013-02-24 08:09:24 +0000
@@ -10636,6 +10636,7 @@
   help_echo_showing_p = 0;
 
   if (STRINGP (Vdebug_on_message)
+      && STRINGP (string)
       && fast_string_match (Vdebug_on_message, string) >= 0)
     call_debugger (list2 (Qerror, string));
 }