mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00
Code Issues Projects Releases Wiki Activity

(read_minibuf): Remove arg KEEP_ALL. Callers changed.

Browse source 
(Fread_from_minibuffer): Remove arg KEEP_ALL.  Callers changed.
This commit is contained in:
Juri Linkov 2006-05-25 21:16:22 +00:00
parent 2c9606674d
commit b35cd21514
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/minibuf.c
View file

@ -219,7 +219,7 @@ static Lisp_Object read_minibuf P_ ((Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object,
int, Lisp_Object,
Lisp_Object, Lisp_Object,
int, int, int));
int, int));
static Lisp_Object read_minibuf_noninteractive P_ ((Lisp_Object, Lisp_Object,
Lisp_Object, Lisp_Object,
int, Lisp_Object,
@ -440,8 +440,7 @@ The current buffer must be a minibuffer. */)
static Lisp_Object
read_minibuf (map, initial, prompt, backup_n, expflag,
histvar, histpos, defalt, allow_props, inherit_input_method,
keep_all)
histvar, histpos, defalt, allow_props, inherit_input_method)
Lisp_Object map;
Lisp_Object initial;
Lisp_Object prompt;
@ -452,7 +451,6 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
Lisp_Object defalt;
int allow_props;
int inherit_input_method;
int keep_all;
{
Lisp_Object val;
int count = SPECPDL_INDEX ();
@ -747,7 +745,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
last_minibuf_string = val;
/* Choose the string to add to the history. */
if (SCHARS (val) != 0 || keep_all)
if (SCHARS (val) != 0)
histstring = val;
else if (STRINGP (defalt))
histstring = defalt;
@ -774,8 +772,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
if (NILP (histval)
|| (CONSP (histval)
/* Don't duplicate the most recent entry in the history. */
&& (keep_all
|| NILP (Fequal (histstring, Fcar (histval))))))
&& (NILP (Fequal (histstring, Fcar (histval))))))
{
Lisp_Object length;
@ -937,7 +934,7 @@ read_minibuf_unwind (data)
}
DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 8, 0,
DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0,
doc: /* Read a string from the minibuffer, prompting with string PROMPT.
The optional second arg INITIAL-CONTENTS is an obsolete alternative to
DEFAULT-VALUE. It normally should be nil in new code, except when
@ -961,8 +958,6 @@ Sixth arg DEFAULT-VALUE is the default value. If non-nil, it is available
the empty string.
Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
the current input method and the setting of `enable-multibyte-characters'.
Eight arg KEEP-ALL, if non-nil, says to put all inputs in the history list,
even empty or duplicate inputs.
If the variable `minibuffer-allow-text-properties' is non-nil,
then the string which is returned includes whatever text properties
were present in the minibuffer. Otherwise the value has no text properties.
@ -978,9 +973,9 @@ POSITION in the minibuffer. Any integer value less than or equal to
one puts point at the beginning of the string. *Note* that this
behavior differs from the way such arguments are used in `completing-read'
and some related functions, which use zero-indexing for POSITION. */)
(prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method, keep_all)
(prompt, initial_contents, keymap, read, hist, default_value, inherit_input_method)
Lisp_Object prompt, initial_contents, keymap, read, hist, default_value;
Lisp_Object inherit_input_method, keep_all;
Lisp_Object inherit_input_method;
{
Lisp_Object histvar, histpos, val;
struct gcpro gcpro1;
@ -1011,8 +1006,7 @@ and some related functions, which use zero-indexing for POSITION. */)
Qnil, !NILP (read),
histvar, histpos, default_value,
minibuffer_allow_text_properties,
!NILP (inherit_input_method),
!NILP (keep_all));
!NILP (inherit_input_method));
UNGCPRO;
return val;
}
@ -1029,7 +1023,7 @@ arguments are used as in `read-from-minibuffer') */)
CHECK_STRING (prompt);
return read_minibuf (Vminibuffer_local_map, initial_contents,
prompt, Qnil, 1, Qminibuffer_history,
make_number (0), Qnil, 0, 0, 0);
make_number (0), Qnil, 0, 0);
}
DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
@ -1067,7 +1061,7 @@ Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
Lisp_Object val;
val = Fread_from_minibuffer (prompt, initial_input, Qnil,
Qnil, history, default_value,
inherit_input_method, Qnil);
inherit_input_method);
if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (default_value))
val = default_value;
return val;
@ -1089,7 +1083,7 @@ the current input method and the setting of`enable-multibyte-characters'. */)
CHECK_STRING (prompt);
return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,
0, Qminibuffer_history, make_number (0), Qnil, 0,
!NILP (inherit_input_method), 0);
!NILP (inherit_input_method));
}
DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
@ -1778,7 +1772,7 @@ Completion ignores case if the ambient value of
: Vminibuffer_local_must_match_filename_map),
init, prompt, make_number (pos), 0,
histvar, histpos, def, 0,
!NILP (inherit_input_method), 0);
!NILP (inherit_input_method));
if (STRINGP (val) && SCHARS (val) == 0 && ! NILP (def))
val = def;