[5834] ea_last_executed_command declared static

[Gavin D. Smith]

Revision: 5834
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5834
Author:   gavin
Date:     2014-09-22 16:39:04 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
ea_last_executed_command declared static

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/echo-area.c
    trunk/info/echo-area.h
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-09-21 20:18:22 UTC (rev 5833)
+++ trunk/ChangeLog     2014-09-22 16:39:04 UTC (rev 5834)
@@ -1,3 +1,12 @@
+2014-09-22  Gavin Smith  <address@hidden>
+
+       * info/session.c (info_dispatch_on_key): Don't set 
+       ea_last_executed_command.
+       (info_numeric_arg_digit_loop): Don't declare with 
+       DECLARE_INFO_COMMAND.
+       * info/echo-area.c (ea_last_executed_command): Declared static.
+       (read_and_dispatch_in_echo_area): Set ea_last_executed_command.
+
 2014-09-21  Gavin Smith  <address@hidden>
 
        * info/session.c (info_read_dispatch): Return pointer to function 

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-09-21 20:18:22 UTC (rev 5833)
+++ trunk/info/echo-area.c      2014-09-22 16:39:04 UTC (rev 5834)
@@ -40,7 +40,7 @@
 int echo_area_is_active = 0;
 
 /* The address of the last command executed in the echo area. */
-VFunction *ea_last_executed_command = NULL;
+static VFunction *ea_last_executed_command = NULL;
 
 /* Non-zero means that the last command executed while reading input
    killed some text. */
@@ -191,6 +191,7 @@
       if (cmd)
         {
           (*cmd) (the_echo_area, 1, key);
+          ea_last_executed_command = cmd;
         }
 
       /* Echo area commands that do killing increment the value of
@@ -200,7 +201,7 @@
       if (lk == echo_area_last_command_was_kill)
         echo_area_last_command_was_kill = 0;
 
-      if (ea_last_executed_command == ea_newline || info_aborted_echo_area)
+      if (cmd == ea_newline || info_aborted_echo_area)
         {
           ea_last_executed_command = NULL;
           break;

Modified: trunk/info/echo-area.h
===================================================================
--- trunk/info/echo-area.h      2014-09-21 20:18:22 UTC (rev 5833)
+++ trunk/info/echo-area.h      2014-09-22 16:39:04 UTC (rev 5834)
@@ -33,7 +33,6 @@
 extern void inform_in_echo_area (const char *message);
 extern void echo_area_inform_of_deleted_window (WINDOW *window);
 extern void echo_area_prep_read (void);
-extern VFunction *ea_last_executed_command;
 
 typedef int (*reference_bool_fn) (REFERENCE *);
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-09-21 20:18:22 UTC (rev 5833)
+++ trunk/info/session.c        2014-09-22 16:39:04 UTC (rev 5834)
@@ -4964,17 +4964,7 @@
             if (info_keyseq_displayed_p)
               display_info_keyseq (0);
 
-            {
-              WINDOW *where;
-
-              where = active_window;
-
-              /* If in the echo area, remember the last command executed. */
-              if (where == the_echo_area)
-                ea_last_executed_command = InfoFunction(map[key].function);
-
-              return InfoFunction(map[key].function);
-            }
+            return InfoFunction(map[key].function);
           }
         else
           {
@@ -5029,8 +5019,8 @@
 
 void info_universal_argument (WINDOW *, int count, int key);
 
-DECLARE_INFO_COMMAND (info_numeric_arg_digit_loop,
-                      _("Internally used by \\[universal-argument]"))
+void
+info_numeric_arg_digit_loop (WINDOW *window, int count, int key)
 {
   int pure_key;
   Keymap keymap;