procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* minibuf.c (read_minibuf): Avoid C99ism in previous patch.

Browse source 
Fixes: debbugs:17430
This commit is contained in:
Paul Eggert 2014-05-07 12:28:09 -07:00
parent 551a89e12d
commit d1ff9ee403
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2014-05-07 Paul Eggert <eggert@cs.ucla.edu>
* minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430).
2014-05-07 Jarek Czekalski <jarekczek@poczta.onet.pl>
Fix initialization of minibuffer history variable (Bug#17430).

12
src/minibuf.c
View file

@ -384,6 +384,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
EMACS_INT pos = 0;
/* String to add to the history. */
Lisp_Object histstring;
Lisp_Object histval;
Lisp_Object empty_minibuf;
Lisp_Object dummy, frame;
@ -536,11 +537,12 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
Vminibuffer_completing_file_name = Qlambda;
/* If variable is unbound, make it nil. */
Lisp_Object histval = find_symbol_value (Vminibuffer_history_variable);
if (EQ (histval, Qunbound)) {
Fset (Vminibuffer_history_variable, Qnil);
histval = Qnil;
}
histval = find_symbol_value (Vminibuffer_history_variable);
if (EQ (histval, Qunbound))
{
Fset (Vminibuffer_history_variable, Qnil);
histval = Qnil;
}
if (inherit_input_method)
{