# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1260917491 0
# Node ID 62f00c3d5b6015555bdab898b0c2d57874487509
# Parent  b0e5aae20733b83ae40853f55b81f77329c73f5f
* xdisp.c (decode_mode_spec): Inhibit garbage collection when
calling file-remote-p.  Reported by Jim Meyering.

diff -r b0e5aae20733 -r 62f00c3d5b60 src/ChangeLog
--- a/src/ChangeLog	Tue Dec 15 21:11:39 2009 +0000
+++ b/src/ChangeLog	Tue Dec 15 22:51:31 2009 +0000
@@ -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 -r b0e5aae20733 -r 62f00c3d5b60 src/xdisp.c
--- a/src/xdisp.c	Tue Dec 15 21:11:39 2009 +0000
+++ b/src/xdisp.c	Tue Dec 15 22:51:31 2009 +0000
@@ -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