mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-17 08:31:09 -08:00
Code Issues Projects Releases Wiki Activity

(Fread_variable): If DEFAULT_VALUE is symbol, use its name.

Browse source 
(Fread_command): Likewise.
This commit is contained in:
Richard M. Stallman 1997-12-21 01:44:07 +00:00
parent eded5b68bc
commit 7c8d993103
1 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/minibuf.c
View file

@ -756,9 +756,20 @@ Prompts with PROMPT. By default, return DEFAULT-VALUE.")
(prompt, default_value)
Lisp_Object prompt, default_value;
{
return Fintern (Fcompleting_read (prompt, Vobarray, Qcommandp, Qt,
Qnil, Qnil, default_value, Qnil),
Qnil);
Lisp_Object name, default_string;
if (NILP (default_value))
default_string = Qnil;
else if (SYMBOLP (default_value))
default_string = XSYMBOL (default_value)->name;
else
default_string = default_value;
name = Fcompleting_read (prompt, Vobarray, Qcommandp, Qt,
Qnil, Qnil, default_string, Qnil);
if (NILP (name))
return name;
return Fintern (name, Qnil);
}
#ifdef NOTDEF
@ -780,10 +791,21 @@ A user variable is one whose documentation starts with a `*' character.")
(prompt, default_value)
Lisp_Object prompt, default_value;
{
return Fintern (Fcompleting_read (prompt, Vobarray,
Quser_variable_p, Qt,
Qnil, Qnil, default_value, Qnil),
Qnil);
Lisp_Object name, default_string;
if (NILP (default_value))
default_string = Qnil;
else if (SYMBOLP (default_value))
default_string = XSYMBOL (default_value)->name;
else
default_string = default_value;
name = Fcompleting_read (prompt, Vobarray,
Quser_variable_p, Qt,
Qnil, Qnil, default_string, Qnil);
if (NILP (name))
return name;
return Fintern (name, Qnil);
}
DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,