[5846] info_all_files moved to session.c; fix return values in a few places

[Gavin D. Smith]

Revision: 5846
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5846
Author:   gavin
Date:     2014-09-29 10:11:11 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
info_all_files moved to session.c; fix return values in a few places

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-09-29 09:51:16 UTC (rev 5845)
+++ trunk/ChangeLog     2014-09-29 10:11:11 UTC (rev 5846)
@@ -7,6 +7,12 @@
        Function split out.
        (look_in_indices): Return value as intended.
 
+       * info/indices.c, info/session.c (allfiles_node) 
+       (info_all_files): Moved between files.
+       * info/session.c (move_to_goal_column): Return type declared as 
+       void.
+       (info_dispatch_on_key): Return values as intended.
+
 2014-09-28  Gavin Smith  <address@hidden>
 
        * info/indices.c (info_index_apropos): Strip any suffix like 

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-09-29 09:51:16 UTC (rev 5845)
+++ trunk/info/indices.c        2014-09-29 10:11:11 UTC (rev 5846)
@@ -851,17 +851,3 @@
 
   free (line);
 }
-
-NODE *allfiles_node = 0;
-
-DECLARE_INFO_COMMAND (info_all_files, _("Show all matching files"))
-{
-  if (!allfiles_node)
-    {
-      info_error (_("No file index"));
-      return;
-    }
-
-  /* FIXME: Copy allfiles_node so it is unique in the window history? */
-  info_set_node_of_window (window, allfiles_node);
-}

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-09-29 09:51:16 UTC (rev 5845)
+++ trunk/info/session.c        2014-09-29 10:11:11 UTC (rev 5846)
@@ -55,9 +55,20 @@
 /* Becomes non-zero when 'q' is typed to an Info window. */
 static int quit_info_immediately = 0;
 
-/* Defined in indices.c */
-extern NODE *allfiles_node;
+static NODE *allfiles_node = 0;
 
+DECLARE_INFO_COMMAND (info_all_files, _("Show all matching files"))
+{
+  if (!allfiles_node)
+    {
+      info_error (_("No file index"));
+      return;
+    }
+
+  /* FIXME: Copy allfiles_node so it is unique in the window history? */
+  info_set_node_of_window (window, allfiles_node);
+}
+
 static void
 allfiles_create_node (char *term, REFERENCE **fref)
 {
@@ -1226,7 +1237,7 @@
 void info_prev_line (WINDOW *, int count, int key);
 
 /* Move to goal column, or end of line. */
-static long
+static void
 move_to_goal_column (WINDOW *window)
 {
   long goal;
@@ -4956,7 +4967,7 @@
                   {
                     add_char_to_keyseq (key);
                     dispatch_error (info_keyseq);
-                    return;
+                    return 0;
                   }
                 return info_dispatch_on_key (lowerkey, map);
               }
@@ -4993,6 +5004,7 @@
         }
       break;
     }
+  return 0;
 }
 
 /* **************************************************************** */