diff src/sysdep.c @ 46:6a22abad6937 r19-15

Import from CVS: tag r19-15
author cvs
date Mon, 13 Aug 2007 08:55:31 +0200
parents ec9a17fef872
children 131b0175ea99
line wrap: on
line diff
--- a/src/sysdep.c	Mon Aug 13 08:55:13 2007 +0200
+++ b/src/sysdep.c	Mon Aug 13 08:55:31 2007 +0200
@@ -582,6 +582,7 @@
   Lisp_Object dir;
   unsigned char *str = 0;
   int len;
+  struct gcpro gcpro1;
 
   saved_handlers[0].code = SIGINT;
   saved_handlers[1].code = SIGQUIT;
@@ -601,8 +602,11 @@
   dir = Fsymbol_value (Qdefault_directory);
   if (!STRINGP (dir))
     goto xyzzy;
-  
-  dir = expand_and_dir_to_file (Funhandled_file_name_directory (dir), Qnil);
+
+  GCPRO1 (dir);
+  dir = Funhandled_file_name_directory (dir);
+  dir = expand_and_dir_to_file (dir, Qnil);
+  UNGCPRO;
   str = (unsigned char *) alloca (XSTRING_LENGTH (dir) + 2);
   len = XSTRING_LENGTH (dir);
   memcpy (str, XSTRING_DATA (dir), len);