# HG changeset patch # User Dave Love # Date 949685493 0 # Node ID d9295615b99f1fbc160e2b99cd32490d4baadc3b # Parent f284f17c6b1be2fc8c7b0581845524c56d79d27d (read_minibuf_noninteractive): Remove undeclared gcpro1, gcpro2. (read_minibuf): Deal with allow_props correctly. diff -r f284f17c6b1b -r d9295615b99f src/minibuf.c --- a/src/minibuf.c Fri Feb 04 15:18:30 2000 +0000 +++ b/src/minibuf.c Fri Feb 04 17:31:33 2000 +0000 @@ -276,7 +276,6 @@ { int size, len; char *line, *s; - struct gcpro gcpro1, gcpro2; Lisp_Object val; fprintf (stdout, "%s", XSTRING (prompt)->data); @@ -566,7 +565,10 @@ /* 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. */