[Emacs-diffs] emacs-24 r117077: Fix initialization of minibuffer history variable, bug #17430.

[Jarek Czekalski]

------------------------------------------------------------
revno: 117077
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17430
committer: Jarek Czekalski <address@hidden>
branch nick: emacs24-bzr
timestamp: Wed 2014-05-07 17:03:47 +0200
message:
  Fix initialization of minibuffer history variable, bug #17430.
  
        * minibuf.c (read_minibuf): Initialize histval to Qnil if unbound.
        Move the initialization up to prevent any "value void" message.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/minibuf.c                  minibuf.c-20091113204419-o5vbwnq5f7feedwu-242

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-06 16:16:57 +0000
+++ b/src/ChangeLog     2014-05-07 15:03:47 +0000
@@ -1,3 +1,9 @@
+2014-05-07  Jarek Czekalski  <address@hidden>
+
+       Fix initialization of minibuffer history variable (Bug#17430).
+       * minibuf.c (read_minibuf): Initialize histval to Qnil if unbound.
+       Move the initialization up to prevent any "value void" message.
+
 2014-05-06  Samuel Bronson  <address@hidden>
 
        * keyboard.c (Frecursive_edit): Ensure inc&dec of command_loop_level

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2014-02-08 04:23:25 +0000
+++ b/src/minibuf.c     2014-05-07 15:03:47 +0000
@@ -535,6 +535,13 @@
   if (!NILP (Vminibuffer_completing_file_name))
     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;
+  }
+
   if (inherit_input_method)
     {
       /* `current-input-method' is buffer local.  So, remember it in
@@ -703,13 +710,6 @@
     {
       /* If the caller wanted to save the value read on a history list,
         then do so if the value is not already the front of the list.  */
-      Lisp_Object histval;
-
-      /* If variable is unbound, make it nil.  */
-
-      histval = find_symbol_value (Vminibuffer_history_variable);
-      if (EQ (histval, Qunbound))
-       Fset (Vminibuffer_history_variable, Qnil);
 
       /* The value of the history variable must be a cons or nil.  Other
         values are unacceptable.  We silently ignore these values.  */