[Emacs-diffs] emacs-24 r117079: * minibuf.c (read_minibuf): Avoid C99ism in previous patch.

[Paul Eggert]

------------------------------------------------------------
revno: 117079
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17430
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-07 12:28:09 -0700
message:
  * minibuf.c (read_minibuf): Avoid C99ism in previous patch.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/minibuf.c                  minibuf.c-20091113204419-o5vbwnq5f7feedwu-242

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-07 15:03:47 +0000
+++ b/src/ChangeLog     2014-05-07 19:28:09 +0000
@@ -1,3 +1,7 @@
+2014-05-07  Paul Eggert  <address@hidden>
+
+       * minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430).
+
 2014-05-07  Jarek Czekalski  <address@hidden>
 
        Fix initialization of minibuffer history variable (Bug#17430).

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2014-05-07 15:03:47 +0000
+++ b/src/minibuf.c     2014-05-07 19:28:09 +0000
@@ -384,6 +384,7 @@
   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 @@
     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)
     {