diff options
| author | Paul Eggert | 2012-09-04 20:37:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-04 20:37:32 -0700 |
| commit | 014d93beeff943c5b5f34995002ec575cd15c244 (patch) | |
| tree | 9e3ceee9fc0c2115347460747f3349eb1f090c76 | |
| parent | 776f29e171a93dac78b15397393bf40d8fcfd584 (diff) | |
| download | emacs-014d93beeff943c5b5f34995002ec575cd15c244.tar.gz emacs-014d93beeff943c5b5f34995002ec575cd15c244.zip | |
* xdisp.c (set_message): Simplify and reindent last change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7922a92d0fc..5ff49aadd87 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-09-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xdisp.c (set_message): Simplify and reindent last change. | ||
| 4 | |||
| 1 | 2012-09-05 Juanma Barranquero <lekktu@gmail.com> | 5 | 2012-09-05 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. | 7 | * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies. |
diff --git a/src/xdisp.c b/src/xdisp.c index 90a8de0be27..bec9ec91d2f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -10601,12 +10601,12 @@ set_message (const char *s, Lisp_Object string, | |||
| 10601 | message_buf_print = 0; | 10601 | message_buf_print = 0; |
| 10602 | help_echo_showing_p = 0; | 10602 | help_echo_showing_p = 0; |
| 10603 | 10603 | ||
| 10604 | if (NILP (Vinhibit_debug_on_message) && | 10604 | if (NILP (Vinhibit_debug_on_message) && STRINGP (Vdebug_on_message) |
| 10605 | STRINGP (Vdebug_on_message) && | 10605 | && fast_string_match (Vdebug_on_message, string) >= 0) |
| 10606 | fast_string_match (Vdebug_on_message, string) >= 0) { | 10606 | { |
| 10607 | specbind (Qinhibit_debug_on_message, Qt); | 10607 | specbind (Qinhibit_debug_on_message, Qt); |
| 10608 | call_debugger (Fcons (Qerror, Fcons (string, Qnil))); | 10608 | call_debugger (list2 (Qerror, string)); |
| 10609 | } | 10609 | } |
| 10610 | 10610 | ||
| 10611 | unbind_to (count, Qnil); | 10611 | unbind_to (count, Qnil); |
| 10612 | } | 10612 | } |