entered into RCS

3 files changed, 11 insertions, 11 deletions

diff --git a/src/fileio.c b/src/fileio.c
index fcf1a6772f0..bb50ac499fa 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2943,7 +2943,7 @@ DIR defaults to current buffer's directory default.")
   (prompt, dir, defalt, mustmatch, initial)
      Lisp_Object prompt, dir, defalt, mustmatch, initial;
 {
-  Lisp_Object val, insdef, tem;
+  Lisp_Object val, insdef, insdef1, tem;
   struct gcpro gcpro1, gcpro2;
   register char *homedir;
   int count;
@@ -2968,6 +2968,7 @@ DIR defaults to current buffer's directory default.")
   if (insert_default_directory)
     {
       insdef = dir;
+      insdef1 = dir;
       if (!NILP (initial))
         {
           Lisp_Object args[2], pos;
@@ -2976,11 +2977,11 @@ DIR defaults to current buffer's directory default.")
           args[1] = initial;
           insdef = Fconcat (2, args);
           pos = make_number (XSTRING (dir)->size);
-          insdef = Fcons (insdef, pos);
+          insdef1 = Fcons (insdef, pos);
         }
     }
   else
-    insdef = build_string ("");
+    insdef = Qnil, insdef1 = Qnil;
 
 #ifdef VMS
   count = specpdl_ptr - specpdl;
@@ -2989,8 +2990,7 @@ DIR defaults to current buffer's directory default.")
 
   GCPRO2 (insdef, defalt);
   val = Fcompleting_read (prompt, intern ("read-file-name-internal"),
-                          dir, mustmatch,
-                          insert_default_directory ? insdef : Qnil,
+                          dir, mustmatch, insdef1,
                           Qfile_name_history);
 
 #ifdef VMS
diff --git a/src/fns.c b/src/fns.c
index 89afc34362e..d39e59a8c47 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1170,7 +1170,7 @@ and can edit it until it as been confirmed.")
   GCPRO1 (prompt);
   while (1)
     {
-      ans = Fdowncase (Fread_minibuffer (prompt, Qnil));
+      ans = Fdowncase (Fread_string (prompt, Qnil));
       if (XSTRING (ans)->size == 3 && !strcmp (XSTRING (ans)->data, "yes"))
         {
           UNGCPRO;
diff --git a/src/minibuf.c b/src/minibuf.c
index 1997f4f5cbb..47b7e1d99be 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -94,9 +94,9 @@ Lisp_Object get_minibuffer ();
 Lisp_Object read_minibuf ();
 
 /* Read from the minibuffer using keymap MAP, initial contents INITIAL
-   (a string), putting point BACKUP_N chars from the end of INITIAL,
+   (a string), putting point minus BACKUP_N chars from the end of INITIAL,
    prompting with PROMPT (a string), using history list HISTVAR
-   with initial position HISTPOS.
+   with initial position HISTPOS.  (BACKUP_N should be <= 0.)
 
    Normally return the result as a string (the text that was read),
    but if EXPFLAG is non-nil, read it and return the object read.  */
@@ -106,7 +106,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos)
      Lisp_Object map;
      Lisp_Object initial;
      Lisp_Object prompt;
-     Lisp_Object backup_n;
+     int backup_n;
      int expflag;
      Lisp_Object histvar;
      Lisp_Object histpos;
@@ -378,7 +378,7 @@ Fifth arg HIST, if non-nil, specifies a history list\n\
     XFASTINT (histpos) = 0;
 
   return read_minibuf (keymap, initial_input, prompt,
-                       pos, !NILP (read), histvar, histpos);
+                       make_number (pos), !NILP (read), histvar, histpos);
 }
 
 DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
@@ -869,7 +869,7 @@ Completion ignores case if the ambient value of\n\
   val = read_minibuf (NILP (require_match)
                       ? Vminibuffer_local_completion_map
                       : Vminibuffer_local_must_match_map,
-                      init, prompt, pos, 0,
+                      init, prompt, make_number (pos), 0,
                       histvar, histpos);
   return unbind_to (count, val);
 }