[5631] list_visited_nodes: use info_set_node_of_window

[Gavin D. Smith]

Revision: 5631
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5631
Author:   gavin
Date:     2014-06-01 22:26:10 +0000 (Sun, 01 Jun 2014)
Log Message:
-----------
list_visited_nodes: use info_set_node_of_window

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/nodemenu.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-01 22:08:12 UTC (rev 5630)
+++ trunk/ChangeLog     2014-06-01 22:26:10 UTC (rev 5631)
@@ -12,6 +12,11 @@
        of window_set_node_of_window to save point and pagetop.
        (calling_window_point, calling_window_pagetop): Delete unused.
 
+       * info/nodemenu.c (list_visited_nodes): Call
+       info_set_node_of_window instead of set_remembered_pagetop_and_point,
+       window_set_node_of_window and remember_window_and_node individually.
+       (get_visited_nodes) Remove unnecessary check.
+
 2014-06-01  Gavin Smith  <address@hidden>
 
        * info/session.c (info_print_node, print_node): print_node merged

Modified: trunk/info/nodemenu.c
===================================================================
--- trunk/info/nodemenu.c       2014-06-01 22:08:12 UTC (rev 5630)
+++ trunk/info/nodemenu.c       2014-06-01 22:26:10 UTC (rev 5631)
@@ -145,8 +145,7 @@
           NODE *history_node = info_win->hist[i]->node;
 
           /* We skip mentioning "*Node Menu*" nodes. */
-          if (internal_info_node_p (history_node) &&
-              (strcmp (node->nodename, nodemenu_nodename) == 0))
+          if (strcmp (history_node->nodename, nodemenu_nodename) == 0)
             continue;
 
           if (history_node)
@@ -227,8 +226,6 @@
   WINDOW *new;
   NODE *node;
 
-  set_remembered_pagetop_and_point (window);
-
   /* If a window is visible and showing the buffer list already, re-use it. */
   for (new = windows; new; new = new->next)
     {
@@ -270,34 +267,7 @@
   node = get_visited_nodes ();
   name_internal_node (node, nodemenu_nodename);
 
-#if 0
-  /* Even if this is an internal node, we don't want the window
-     system to treat it specially.  So we turn off the internalness
-     of it here. */
-  /* Why?  We depend on internal_info_node_p returning true, so we must
-     not remove the flag.  Otherwise, the *Node Menu* nodes themselves
-     appear in the node menu.  --Andreas Schwab
-     <address@hidden>.  */
-  node->flags &= ~N_IsInternal;
-#endif
-
-  /* If this window is already showing a node menu, reuse the existing node
-     slot. */
-  {
-    int remember_me = 1;
-
-#if defined (NOTDEF)
-    if (internal_info_node_p (new->node) &&
-        (strcmp (new->node->nodename, nodemenu_nodename) == 0))
-      remember_me = 0;
-#endif /* NOTDEF */
-
-    window_set_node_of_window (new, node);
-
-    if (remember_me)
-      remember_window_and_node (new);
-  }
-
+  info_set_node_of_window (new, node);
   active_window = new;
 }