(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.

(read_minibuf): Deal with allow_props correctly.

diff --git a/src/minibuf.c b/src/minibuf.c
index a098c68d908a48cd61d752326a5eca4927b87cbe..406c19611864927d3910f630e37b8a82cce85b4e 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -276,7 +276,6 @@ read_minibuf_noninteractive (map, initial, prompt, backup_n, expflag,
 {
   int size, len;
   char *line, *s;
-  struct gcpro gcpro1, gcpro2;
   Lisp_Object val;
 
   fprintf (stdout, "%s", XSTRING (prompt)->data);
@@ -566,7 +565,10 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 
   /* Make minibuffer contents into a string.  */
   Fset_buffer (minibuffer);
-  val = Ffield_string (make_number (ZV), allow_props ? Qt : Qnil);
+  if (allow_props)
+    val = Ffield_string (make_number (ZV));
+  else
+    val = Ffield_string_no_properties (make_number (ZV));
 
   /* VAL is the string of minibuffer text.  */