From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 3 Mar 1994 21:01:37 +0000 (+0000)
Subject: (Fread_file_name):  Do the right thing when insert-default-directory is nil.
X-Git-Tag: emacs-19.34~9671
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=351bd676ba0e7ba666ccf3234415448e17565245;p=emacs.git

(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 a95c9847910..3b1513600e2 100644
--- 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;