diff src/fileio.c @ 6181:dd271c6b4e56

(Fread_file_name): Do the right thing when insert-default-directory is nil. Allow for doubled dollar signs in dir when computing pos.

--- a/src/fileio.c	Thu Mar 03 20:12:01 1994 +0000
+++ b/src/fileio.c	Thu Mar 03 21:01:37 1994 +0000
@@ -3704,7 +3704,6 @@
   if (insert_default_directory)
     {
       insdef = dir;
-      insdef1 = dir;
       if (!NILP (initial))
 	{
 	  Lisp_Object args[2], pos;
@@ -3712,12 +3711,17 @@
 	  args[0] = insdef;
 	  args[1] = initial;
 	  insdef = Fconcat (2, args);
-	  pos = make_number (XSTRING (dir)->size);
+	  pos = make_number (XSTRING (double_dollars (dir))->size);
 	  insdef1 = Fcons (double_dollars (insdef), pos);
 	}
       else
 	insdef1 = double_dollars (insdef);
     }
+  else if (!NILP (initial))
+    {
+      insdef = initial;
+      insdef1 = Fcons (double_dollars (insdef), 0);
+    }
   else
     insdef = Qnil, insdef1 = Qnil;