1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ea3b3a92e01..d7a263df229 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-04  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * eval.c (call_debugger): Make the function non-static so that we
+        can call it from set_message.
+
+        * xdisp.c (set_message): Implement the new variable `debug-on-message'.
+        (syms_of_xdisp): Defvar it and `inhibit-debug-on-message'.
+
 2012-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Give more-useful info on a fatal error (Bug#12328).