Merge from emacs-24; up to 2014-06-23T06:25:47Z!rgm@gnu.org

2 files changed, 11 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 000ddf2d877..1ffd1af5af3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (decode_mode_spec): Call file-remote-p on the current
+        buffer's default-directory only if it is a string.  (Bug#17986)
+
 2014-07-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
         More precise control over values of some buffer-local variables.
diff --git a/src/xdisp.c b/src/xdisp.c
index b83a2855927..f1e01146e9f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22889,8 +22889,12 @@ decode_mode_spec (struct window *w, register int c, int field_width,
     case '@':
       {
         ptrdiff_t count = inhibit_garbage_collection ();
-        Lisp_Object val = call1 (intern ("file-remote-p"),
-                                 BVAR (current_buffer, directory));
+        Lisp_Object curdir = BVAR (current_buffer, directory);
+        Lisp_Object val = Qnil;
+
+        if (STRINGP (curdir))
+          val = call1 (intern ("file-remote-p"), curdir);
+
         unbind_to (count, Qnil);
 
         if (NILP (val))