1 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cc8cb84831a..8d3fc1e56fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+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.
+        * filelock.c (fill_in_lock_file_name): Fix crash caused by the
+        2012-07-10 patch to this file.  Reported by Eli Zaretskii in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+        and diagnosed by Andreas Schwab in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+
 2013-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume C89 or better.