[5632] info_set_node_of_window instead of window_set_node_of_window

[Gavin D. Smith]

Revision: 5632
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5632
Author:   gavin
Date:     2014-06-01 22:44:36 +0000 (Sun, 01 Jun 2014)
Log Message:
-----------
info_set_node_of_window instead of window_set_node_of_window

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/ChangeLog     2014-06-01 22:44:36 UTC (rev 5632)
@@ -17,6 +17,12 @@
        window_set_node_of_window and remember_window_and_node individually.
        (get_visited_nodes) Remove unnecessary check.
 
+       * info/indices.c (do_info_index_search, info_index_apropos)
+       * info/infodoc.c (info_find_or_create_help_window):
+       Call info_set_node_of_window instead of window_set_node_of_window.
+       * info/session.c (set_remembered_pagetop_and_point): Declared
+       static.
+
 2014-06-01  Gavin Smith  <address@hidden>
 
        * info/session.c (info_print_node, print_node): print_node merged

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/info/echo-area.c      2014-06-01 22:44:36 UTC (rev 5632)
@@ -1086,7 +1086,6 @@
 #endif /* !SPLIT_BEFORE_ACTIVE */
 
                 echo_area_completions_window = compwin;
-                remember_window_and_node (compwin);
               }
             else
               compwin = calling_window;

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/info/indices.c        2014-06-01 22:44:36 UTC (rev 5632)
@@ -243,9 +243,7 @@
               node = info_get_node (initial_index_filename,
                                     initial_index_nodename,
                                     PARSE_NODE_DFLT);
-              set_remembered_pagetop_and_point (window);
-              window_set_node_of_window (window, node);
-              remember_window_and_node (window);
+              info_set_node_of_window (window, node);
               window_clear_echo_area ();
               return;
             }
@@ -665,8 +663,6 @@
         WINDOW *new;
         NODE *node;
 
-        set_remembered_pagetop_and_point (window);
-
         /* If a window is visible and showing an apropos list already,
            re-use it. */
         for (new = windows; new; new = new->next)
@@ -702,8 +698,7 @@
         /* Lines do not wrap in this window. */
         new->flags |= W_NoWrap;
 
-        window_set_node_of_window (new, apropos_node);
-        remember_window_and_node (new);
+        info_set_node_of_window (new, apropos_node);
         active_window = new;
       }
       free (apropos_list);

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/info/infodoc.c        2014-06-01 22:44:36 UTC (rev 5632)
@@ -478,8 +478,7 @@
         }
       else
         {
-          set_remembered_pagetop_and_point (active_window);
-          window_set_node_of_window (active_window, internal_info_help_node);
+          info_set_node_of_window (active_window, internal_info_help_node);
           help_window = active_window;
         }
     }
@@ -488,12 +487,10 @@
          existing window in which to place the node. */
       if (active_window != help_window)
         {
-          set_remembered_pagetop_and_point (active_window);
           active_window = help_window;
         }
-      window_set_node_of_window (active_window, internal_info_help_node);
+      info_set_node_of_window (active_window, internal_info_help_node);
     }
-  remember_window_and_node (help_window);
   return help_window;
 }
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/info/session.c        2014-06-01 22:44:36 UTC (rev 5632)
@@ -310,7 +310,7 @@
 /* Reset the remembered pagetop and point of WINDOW to WINDOW's current
    values if the window and node are the same as the current one being
    displayed. */
-void
+static void
 set_remembered_pagetop_and_point (WINDOW *win)
 {
   if (win->hist_index && win->hist[win->hist_index - 1]->node == win->node)

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-06-01 22:26:10 UTC (rev 5631)
+++ trunk/info/session.h        2014-06-01 22:44:36 UTC (rev 5632)
@@ -77,7 +77,6 @@
 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);
-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);
 extern void initialize_keyseq (void);