mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

(Fread_from_minibuffer): Add gcpro.

Browse Source
This commit is contained in:
Richard M. Stallman 1997-05-15 02:28:12 +00:00
parent c0c15b9339
commit 1d8d92f4fe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/minibuf.c
View File

@ -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;
}