[6289] display error messages for digit menu entry following

[Gavin D. Smith]

Revision: 6289
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6289
Author:   gavin
Date:     2015-05-29 16:52:29 +0000 (Fri, 29 May 2015)
Log Message:
-----------
display error messages for digit menu entry following

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-05-29 15:58:08 UTC (rev 6288)
+++ trunk/ChangeLog     2015-05-29 16:52:29 UTC (rev 6289)
@@ -1,3 +1,12 @@
+2015-05-29  Gavin Smith  <address@hidden>
+
+       * info/session.c (info_read_and_dispatch): Make call to 
+       window_clear_echo_area conditional on read_key_sequence not 
+       having dispatched to a user command itself, so error messages 
+       aren't cleared.
+       (read_key_sequence) <menu digit>: Clear echo area first.
+       Reported by Benno Schulenberg.
+
 2015-05-29  Benno Schulenberg <address@hidden> (tiny change)
 
        * info/session.c (display_startup_message): Reword note to 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2015-05-29 15:58:08 UTC (rev 6288)
+++ trunk/info/session.c        2015-05-29 16:52:29 UTC (rev 6289)
@@ -238,11 +238,10 @@
       display_cursor_at_point (active_window);
 
       cmd = read_key_sequence (info_keymap, 1, 1, 0, &count);
-      if (!info_keyseq_displayed_p)
-        window_clear_echo_area ();
-
       if (cmd)
         {
+          if (!info_keyseq_displayed_p)
+            window_clear_echo_area ();
 
           (*cmd) (active_window, count);
 
@@ -5234,6 +5233,7 @@
           int k = key;
           if (k > KEYMAP_META_BASE)
             k -= KEYMAP_META_BASE;
+          window_clear_echo_area ();
           menu_digit (active_window, k);
           return 0;
         }