Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org

3 files changed, 16 insertions, 1 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.
diff --git a/src/filelock.c b/src/filelock.c
index 228fe98e8c7..cd2cd2e53a2 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn)
   p[1] = '.';
   p[2] = '#';
 
-  p = p + length + 2;
+  p = lockfile + length + 2;
 
   while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
     {
diff --git a/src/xdisp.c b/src/xdisp.c
index 6b86fd076a5..f304ad0915c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10525,6 +10525,7 @@ set_message (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));
 }