* xdisp.c (decode_mode_spec): Inhibit garbage collection when

calling file-remote-p.  Reported by Jim Meyering.

diff --git a/src/ChangeLog b/src/ChangeLog
index 69c8f22e700b78f0248efbc1e4a2ffc832ac03e4..6c39715fed3bf6896906cca5de21ef118a9cb290 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (decode_mode_spec): Inhibit garbage collection when
+       calling file-remote-p.  Reported by Jim Meyering.
+
 2009-12-15  Michael Albinus  <michael.albinus@gmx.de>
 
        * dbusbind.c (xd_retrieve_arg): Reorder declarations in order to

diff --git a/src/xdisp.c b/src/xdisp.c
index 449d42dcf175fcb470bb02c8fef3dc4f23b0442f..23c5e2d0f4ceba74d434332428e72290933fc33a 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18630,7 +18630,10 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
     case '@':
       {
        Lisp_Object val;
+       int count = inhibit_garbage_collection ();
        val = call1 (intern ("file-remote-p"), current_buffer->directory);
+       unbind_to (count, Qnil);
+
        if (NILP (val))
          return "-";
        else