diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2013-02-24 09:09:24 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2013-02-24 09:09:24 +0100 |
| commit | 51aa2a8b797cefbbee597b5c33ff955c0e470855 (patch) | |
| tree | b9e83919a391af9b30928de16e6cfc8b212b46b2 | |
| parent | 1938d88c74281393f180f7ac3c77418b926ed6e6 (diff) | |
| download | emacs-51aa2a8b797cefbbee597b5c33ff955c0e470855.tar.gz | |
Fixes: debbugs:13797
* xdisp.c (set_message): Only check for debug-on-message if STRING
is a string.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
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)); } |