[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/12/15 22:51:33

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        * xdisp.c (decode_mode_spec): Inhibit garbage collection when
        calling file-remote-p.  Reported by Jim Meyering.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7927&r2=1.7928
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1326&r2=1.1327

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7927
retrieving revision 1.7928
diff -u -b -r1.7927 -r1.7928
--- ChangeLog   15 Dec 2009 05:59:39 -0000      1.7927
+++ ChangeLog   15 Dec 2009 22:51:31 -0000      1.7928
@@ -1,3 +1,8 @@
+2009-12-15  Chong Yidong  <address@hidden>
+
+       * xdisp.c (decode_mode_spec): Inhibit garbage collection when
+       calling file-remote-p.  Reported by Jim Meyering.
+
 2009-12-15  Michael Albinus  <address@hidden>
 
        * dbusbind.c (xd_retrieve_arg): Reorder declarations in order to

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1326
retrieving revision 1.1327
diff -u -b -r1.1326 -r1.1327
--- xdisp.c     5 Dec 2009 22:49:01 -0000       1.1326
+++ xdisp.c     15 Dec 2009 22:51:33 -0000      1.1327
@@ -18630,7 +18630,10 @@
     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