[5708] clear echo area in fewer places in code

[Gavin D. Smith]

Revision: 5708
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5708
Author:   gavin
Date:     2014-07-14 17:09:02 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
clear echo area in fewer places in code

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/echo-area.c
    trunk/info/indices.c
    trunk/info/m-x.c
    trunk/info/nodemenu.c
    trunk/info/session.c
    trunk/info/variables.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/ChangeLog     2014-07-14 17:09:02 UTC (rev 5708)
@@ -1,3 +1,17 @@
+2014-07-14  Gavin Smith  <address@hidden>
+
+       * info/echo-area.c (info_read_in_echo_area)
+       (info_read_completing_internal): Call window_clear_echo_area after
+       getting user input.
+       * info/indices.c (do_info_index_search, info_index_apropos)
+       (info_virtual_index)
+       * info/m-x.c (read_function_name, set_screen_height)
+       * info/nodemenu.c (select_visited_node)
+       * info/session.c (info_menu_or_ref_item, info_menu_sequence)
+       (info_goto_node, info_goto_invocation_node, info_man, info_view_file)
+       * info/variables.c (set_variable, read_variable_name): Don't call
+       window_clear_echo_area.
+
 2014-07-13  Gavin Smith  <address@hidden>
 
        * info/t/adjust-anchors.sh: New test.

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/echo-area.c      2014-07-14 17:09:02 UTC (rev 5708)
@@ -232,6 +232,8 @@
   /* Read characters in the echo area. */
   read_and_dispatch_in_echo_area ();
 
+  window_clear_echo_area ();
+
   echo_area_is_active--;
 
   /* Restore the original active window and show point in it. */
@@ -894,6 +896,7 @@
       break;
     }
   echo_area_is_active--;
+  window_clear_echo_area ();
 
   /* Restore the original active window and show point in it. */
   active_window = calling_window;

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/indices.c        2014-07-14 17:09:02 UTC (rev 5708)
@@ -238,7 +238,6 @@
               node = info_get_node (initial_index_filename,
                                     initial_index_nodename);
               info_set_node_of_window (window, node);
-              window_clear_echo_area ();
               return;
             }
         }
@@ -691,9 +690,6 @@
       free (apropos_list);
     }
   free (line);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 static FILE_BUFFER *
@@ -843,9 +839,6 @@
   node = create_virtindex_node (tfb);
   
   info_set_node_of_window (window, node);
-  
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 NODE *allfiles_node = 0;
@@ -860,7 +853,4 @@
 
   /* FIXME: Copy allfiles_node so it is unique in the window history? */
   info_set_node_of_window (window, allfiles_node);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }

Modified: trunk/info/m-x.c
===================================================================
--- trunk/info/m-x.c    2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/m-x.c    2014-07-14 17:09:02 UTC (rev 5708)
@@ -54,12 +54,8 @@
     }
 
   line = info_read_completing_in_echo_area (window, prompt, array);
-
   info_free_references (array);
 
-  if (!echo_area_is_active)
-    window_clear_echo_area ();
-
   return line;
 }
 
@@ -182,10 +178,6 @@
       if (*line)
         new_height = atoi (line);
 
-      /* Clear the echo area if it isn't active. */
-      if (!echo_area_is_active)
-        window_clear_echo_area ();
-
       free (line);
     }
 

Modified: trunk/info/nodemenu.c
===================================================================
--- trunk/info/nodemenu.c       2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/nodemenu.c       2014-07-14 17:09:02 UTC (rev 5708)
@@ -279,7 +279,4 @@
 
   free (line);
   free (node);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/session.c        2014-07-14 17:09:02 UTC (rev 5708)
@@ -2445,9 +2445,6 @@
 
       free (line);
     }
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 /* Read a line (with completion) which is the name of a menu item,
@@ -2763,8 +2760,6 @@
           info_set_node_of_window (window, node);
           if (error)
             show_error_node (error);
-          else
-            window_clear_echo_area ();
         }
 
       free (nodes);
@@ -2873,8 +2868,6 @@
     info_parse_and_select (line, window);
 
   free (line);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 /* Find the node in the file with Top node NODE that is the best candidate to
@@ -3019,8 +3012,6 @@
   top_node = info_get_node (file_name, 0);
   if (!top_node)
     info_error (msg_cant_find_node, "Top");
-  else
-    window_clear_echo_area ();
 
   invocation_ref = info_intuit_options_node (top_node, program_name);
 
@@ -3054,8 +3045,6 @@
     }
 
   free (line);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 /* Move to the "Top" node in this file. */
@@ -3120,9 +3109,6 @@
 
       free (line);
     }
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
 }
 
 /* **************************************************************** */

Modified: trunk/info/variables.c
===================================================================
--- trunk/info/variables.c      2014-07-13 12:02:20 UTC (rev 5707)
+++ trunk/info/variables.c      2014-07-14 17:09:02 UTC (rev 5708)
@@ -155,10 +155,6 @@
                var->name, potential_value);
       line = info_read_in_echo_area (active_window, prompt);
 
-      /* If no error was printed, clear the echo area. */
-      if (!info_error_was_printed)
-        window_clear_echo_area ();
-
       /* User aborted? */
       if (!line)
         return;
@@ -197,9 +193,6 @@
 
       info_free_references (array);
 
-      if (!echo_area_is_active)
-        window_clear_echo_area ();
-
       /* User aborted? */
       if (!line)
         {
@@ -247,14 +240,10 @@
   variables = make_variable_completions_array ();
 
   /* Ask the completer to read a variable for us. */
-  line =
-    info_read_completing_in_echo_area (window, prompt, variables);
+  line = info_read_completing_in_echo_area (window, prompt, variables);
 
   info_free_references (variables);
 
-  if (!echo_area_is_active)
-    window_clear_echo_area ();
-
   /* User aborted? */
   if (!line)
     {