summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-05-15 02:28:12 +0000
committerRichard M. Stallman <rms@gnu.org>1997-05-15 02:28:12 +0000
commit1d8d92f4fe0fc2d1d0d0d4d56e7bcbf1ca031a99 (patch)
treef09504d0b54395ae5258632a81787c755db09515
parentc0c15b93398f689277e3e698dd12368475bfc978 (diff)
downloademacs-1d8d92f4fe0fc2d1d0d0d4d56e7bcbf1ca031a99.tar.gz
emacs-1d8d92f4fe0fc2d1d0d0d4d56e7bcbf1ca031a99.tar.bz2
emacs-1d8d92f4fe0fc2d1d0d0d4d56e7bcbf1ca031a99.zip
(Fread_from_minibuffer): Add gcpro.
-rw-r--r--src/minibuf.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 6395860f826..b8c44e23447 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -548,7 +548,7 @@ read_minibuf_unwind (data)
for make-docfile to see. We cannot put this in the real DEFUN
due to limits in the Unix cpp.
-DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0,
+DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 6, 0,
"Read a string from the minibuffer, prompting with string PROMPT.\n\
If optional second arg INITIAL-CONTENTS is non-nil, it is a string\n\
to be inserted into the minibuffer before reading input.\n\
@@ -579,6 +579,8 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1,
{
int pos = 0;
Lisp_Object histvar, histpos, position, val;
+ struct gcpro gcpro1;
+
position = Qnil;
CHECK_STRING (prompt, 0);
@@ -622,11 +624,13 @@ DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1,
if (NILP (histpos))
XSETFASTINT (histpos, 0);
+ GCPRO1 (default_value);
val = read_minibuf (keymap, initial_contents, prompt,
make_number (pos), !NILP (read),
histvar, histpos, default_value);
if (STRINGP (val) && XSTRING (val)->size == 0 && ! NILP (default_value))
val = default_value;
+ UNGCPRO;
return val;
}