2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 914c005a046..42a2fd0dcac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xdisp.c (set_message): Only check for debug-on-message if STRING
+        is a string.  (Bug#13797)
+
 2013-02-24  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix regression introduced by July 10 filelock.c patch.
diff --git a/src/xdisp.c b/src/xdisp.c
index 55d1272faaf..d42862b190a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10636,6 +10636,7 @@ set_message (const char *s, Lisp_Object string,
   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));
 }