From: Dave Love <fx@gnu.org>
Date: Fri, 4 Feb 2000 17:31:33 +0000 (+0000)
Subject: (read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
X-Git-Tag: emacs-pretest-21.0.90~5095
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be95a9b6662c3a3c3f148b06c76afde3c02682bc;p=emacs.git

(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 a098c68d908..406c1961186 100644
--- 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.  */