(Fread_file_name): Do the right thing when insert-default-directory is nil.

Allow for doubled dollar signs in dir when computing pos.

diff --git a/src/fileio.c b/src/fileio.c
index a95c9847910f36906c2d573a9ca3ac8baf51ad80..3b1513600e28e52d66d15c5753c7a393b980886e 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3704,7 +3704,6 @@ DIR defaults to current buffer's directory default.")
   if (insert_default_directory)
     {
       insdef = dir;
-      insdef1 = dir;
       if (!NILP (initial))
        {
          Lisp_Object args[2], pos;
@@ -3712,12 +3711,17 @@ DIR defaults to current buffer's directory default.")
          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;