summaryrefslogtreecommitdiff
path: root/src/minibuf.c
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2000-02-04 17:31:33 +0000
committerDave Love <fx@gnu.org>2000-02-04 17:31:33 +0000
commitbe95a9b6662c3a3c3f148b06c76afde3c02682bc (patch)
tree8ccca78a9235f1cd298a6e882f6969d5ba711f23 /src/minibuf.c
parentb85e9462bf6ddf29d1889439a595ac25490f981a (diff)
downloademacs-be95a9b6662c3a3c3f148b06c76afde3c02682bc.tar.gz
(read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2.
(read_minibuf): Deal with allow_props correctly.
Diffstat (limited to 'src/minibuf.c')
-rw-r--r--src/minibuf.c6
1 files changed, 4 insertions, 2 deletions
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. */