(read_minibuf): Do use DEFALT in place of empty input

when when expflag is nonzero.
(Fread_no_blanks_input): Arg INIT renamed to INITIAL.

diff --git a/src/minibuf.c b/src/minibuf.c
index 5e9bfe13b0bf70c32674aab6025958c45239f7a6..e0bf54aaf32915169e1dec0bd022751e759bfd8e 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -469,6 +469,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
       unsigned char *p;
       int pos;
 
+      if (STRINGP (val) && XSTRING (val)->size == 0
+         && STRINGP (defalt))
+       val = defalt;
+
       expr_and_pos = Fread_from_string (val, Qnil, Qnil);
       pos = XINT (Fcdr (expr_and_pos));
       if (pos != XSTRING (val)->size)
@@ -752,18 +756,18 @@ Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits\n\
 }
 
 DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, 3, 0,
-  "Args PROMPT and INIT, strings.  Read a string from the terminal, not allowing blanks.\n\
-Prompt with PROMPT, and provide INIT as an initial value of the input string.\n\
+  "Read a string from the terminal, not allowing blanks.\n\
+Prompt with PROMPT, and provide INITIAL as an initial value of the input string.\n\
 Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits\n\
 the current input method and the setting of enable-multibyte-characters.")
-  (prompt, init, inherit_input_method)
-     Lisp_Object prompt, init, inherit_input_method;
+  (prompt, initial, inherit_input_method)
+     Lisp_Object prompt, initial, inherit_input_method;
 {
   CHECK_STRING (prompt, 0);
-  if (! NILP (init))
-    CHECK_STRING (init, 1);
+  if (! NILP (initial))
+    CHECK_STRING (initial, 1);
 
-  return read_minibuf (Vminibuffer_local_ns_map, init, prompt, Qnil,
+  return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,
                       0, Qminibuffer_history, make_number (0), Qnil, 0,
                       !NILP (inherit_input_method));
 }