[5623] info_win_find_node removed

[Gavin D. Smith]

Revision: 5623
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5623
Author:   gavin
Date:     2014-05-31 22:37:02 +0000 (Sat, 31 May 2014)
Log Message:
-----------
info_win_find_node removed

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-31 22:26:26 UTC (rev 5622)
+++ trunk/ChangeLog     2014-05-31 22:37:02 UTC (rev 5623)
@@ -3,6 +3,9 @@
        * info/infodoc.c (dump_map_to_text_buffer): Hide "echo-area-insert"
        entries in help window.
 
+       * info/session.c (info_win_find_node): Merged into
+       info_handle_pointer.
+
 2014-05-31  Gavin Smith  <address@hidden>
 
        * info/window.h (WINDOW): 'current' field removed.

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-05-31 22:26:26 UTC (rev 5622)
+++ trunk/info/session.c        2014-05-31 22:37:02 UTC (rev 5623)
@@ -1538,22 +1538,6 @@
   info_select_reference (window, &entry);
 }
 
-static int
-info_win_find_node (WINDOW *win, NODE *node)
-{
-  int i;
-
-  for (i = win->nodes_index - 1; i >= 0; i--)
-    {
-      NODE *p = win->nodes[i];
-
-      if (p->filename && !strcmp (p->filename, node->filename)
-         && p->nodename && !strcmp (p->nodename, node->nodename))
-       break;
-    }
-  return i;
-}        
-
 
 /* **************************************************************** */
 /*                                                                  */
@@ -1594,11 +1578,21 @@
       return;
     }
 
-  /* Set the cursor position to the last place it was in the
-     node, if we are going up. */
+  /* If we are going up, set the cursor position to the last place it
+     was in the node. */
   if (strcmp (label, "Up") == 0)
     {
-      int i = info_win_find_node (window, node);
+      int i;
+
+      for (i = window->nodes_index - 1; i >= 0; i--)
+        {
+          NODE *p = window->nodes[i];
+
+          if (p->filename && !strcmp (p->filename, node->filename)
+              && p->nodename && !strcmp (p->nodename, node->nodename))
+            break;
+        }
+
       if (i >= 0)
         node->display_pos = window->points[i];
     }