Commit d1ff9ee4 authored by Paul Eggert's avatar Paul Eggert

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

Fixes: debbugs:17430
parent 551a89e1
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).
......
......@@ -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)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment