diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-07 12:28:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-07 12:28:09 -0700 |
| commit | d1ff9ee403221755ccc259e86e2112959f881047 (patch) | |
| tree | f440703b72457ea070938cf559142e16fcb6010b | |
| parent | 551a89e12d1ac5198a4de25ce24d98358bb1f8db (diff) | |
| download | emacs-d1ff9ee403221755ccc259e86e2112959f881047.tar.gz | |
* minibuf.c (read_minibuf): Avoid C99ism in previous patch.
Fixes: debbugs:17430
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/minibuf.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 027d0fc0d25..3d58769c927 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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). diff --git a/src/minibuf.c b/src/minibuf.c index 03d6104f226..cd108d88ecc 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -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) { |