[5620] remember_window_and_node arguments

[Gavin D. Smith]

Revision: 5620
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5620
Author:   gavin
Date:     2014-05-31 20:42:57 +0000 (Sat, 31 May 2014)
Log Message:
-----------
remember_window_and_node arguments

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/echo-area.c
    trunk/info/footnotes.c
    trunk/info/indices.c
    trunk/info/infodoc.c
    trunk/info/nodemenu.c
    trunk/info/session.c
    trunk/info/session.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/ChangeLog     2014-05-31 20:42:57 UTC (rev 5620)
@@ -6,6 +6,9 @@
        (info_handle_pointer): Don't save pagetop and point - done
        when info_set_node_of_window is called.
 
+       (remember_window_and_node): NODE argument removed.  All callers
+       updated.
+
 2014-05-31  Gavin Smith  <address@hidden>
 
        * info/window.h (WINDOW): Fields added from INFO_WINDOW:

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/echo-area.c      2014-05-31 20:42:57 UTC (rev 5620)
@@ -1092,7 +1092,7 @@
 #endif /* !SPLIT_BEFORE_ACTIVE */
 
                 echo_area_completions_window = compwin;
-                remember_window_and_node (compwin, compwin->node);
+                remember_window_and_node (compwin);
               }
             else
               compwin = calling_window;
@@ -1102,7 +1102,7 @@
           {
             window_set_node_of_window
               (compwin, possible_completions_output_node);
-            remember_window_and_node (compwin, compwin->node);
+            remember_window_and_node (compwin);
           }
 
         display_update_display (windows);

Modified: trunk/info/footnotes.c
===================================================================
--- trunk/info/footnotes.c      2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/footnotes.c      2014-05-31 20:42:57 UTC (rev 5620)
@@ -257,7 +257,7 @@
       window_change_window_height
         (fn_win, fn_win->line_count - fn_win->height);
 
-      remember_window_and_node (fn_win, new_footnotes);
+      remember_window_and_node (fn_win);
       add_gcable_pointer (new_footnotes->contents);
     }
 

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/indices.c        2014-05-31 20:42:57 UTC (rev 5620)
@@ -245,7 +245,7 @@
                                     PARSE_NODE_DFLT);
               set_remembered_pagetop_and_point (window);
               window_set_node_of_window (window, node);
-              remember_window_and_node (window, node);
+              remember_window_and_node (window);
               window_clear_echo_area ();
               return;
             }
@@ -703,7 +703,7 @@
         new->flags |= W_NoWrap;
 
         window_set_node_of_window (new, apropos_node);
-        remember_window_and_node (new, apropos_node);
+        remember_window_and_node (new);
         active_window = new;
       }
       free (apropos_list);

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/infodoc.c        2014-05-31 20:42:57 UTC (rev 5620)
@@ -490,7 +490,7 @@
         }
       window_set_node_of_window (active_window, internal_info_help_node);
     }
-  remember_window_and_node (help_window, help_window->node);
+  remember_window_and_node (help_window);
   return help_window;
 }
 

Modified: trunk/info/nodemenu.c
===================================================================
--- trunk/info/nodemenu.c       2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/nodemenu.c       2014-05-31 20:42:57 UTC (rev 5620)
@@ -295,7 +295,7 @@
     window_set_node_of_window (new, node);
 
     if (remember_me)
-      remember_window_and_node (new, node);
+      remember_window_and_node (new);
   }
 
   active_window = new;

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/session.c        2014-05-31 20:42:57 UTC (rev 5620)
@@ -73,7 +73,6 @@
 /* Minimal length of a search string */
 int min_search_length = 1;
 
-void remember_window_and_node (WINDOW *window, NODE *node);
 void forget_window_and_nodes (WINDOW *window);
 
 /* Begin an info session finding the nodes specified by REFERENCES.  For
@@ -318,7 +317,7 @@
 }
 
 void
-remember_window_and_node (WINDOW *win, NODE *node)
+remember_window_and_node (WINDOW *win)
 {
   /* If this node, the current pagetop, and the current point are the
      same as the current saved node and pagetop, don't really add this to
@@ -326,7 +325,7 @@
      beginning of the program, I'm not sure.  --karl  */
   if (win->nodes
       && win->current >= 0
-      && win->nodes[win->current]->contents == node->contents
+      && win->nodes[win->current]->contents == win->node->contents
       && win->pagetops[win->current] == win->pagetop
       && win->points[win->current] == win->point)
   return;
@@ -346,7 +345,7 @@
                                       win->nodes_slots * sizeof (long));
     }
 
-  win->nodes[win->nodes_index] = node;
+  win->nodes[win->nodes_index] = win->node;
   win->pagetops[win->nodes_index] = win->pagetop;
   win->points[win->nodes_index] = win->point;
   win->current = win->nodes_index++;
@@ -381,7 +380,7 @@
   window_set_node_of_window (window, node);
 
   /* Remember this node and window in our list of info windows. */
-  remember_window_and_node (window, node);
+  remember_window_and_node (window);
 
   /* If doing auto-footnote display/undisplay, show the footnotes belonging
      to this window's node. */
@@ -1267,7 +1266,7 @@
       else
         window_adjust_pagetop (split);
 
-      remember_window_and_node (split, split->node);
+      remember_window_and_node (split);
     }
 }
 
@@ -3562,7 +3561,7 @@
           if (result == search_success)
             {
               /* Yes!  We win. */
-              remember_window_and_node (window, node);
+              remember_window_and_node (window);
               if (!echo_area_is_active)
                {
                  if (msg)

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-05-31 20:25:29 UTC (rev 5619)
+++ trunk/info/session.h        2014-05-31 20:42:57 UTC (rev 5620)
@@ -76,7 +76,7 @@
 extern unsigned char info_get_input_char (void);
 extern unsigned char info_get_another_input_char (void);
 extern unsigned char info_input_pending_p (void);
-extern void remember_window_and_node (WINDOW *window, NODE *node);
+extern void remember_window_and_node (WINDOW *window);
 extern void set_remembered_pagetop_and_point (WINDOW *window);
 extern void set_window_pagetop (WINDOW *window, int desired_top);
 extern void info_set_node_of_window (WINDOW *window, NODE *node);