[5815] find help window with get_internal_info_window

[Gavin D. Smith]

Revision: 5815
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5815
Author:   gavin
Date:     2014-09-09 15:42:28 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
find help window with get_internal_info_window

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/info-utils.c
    trunk/info/info-utils.h
    trunk/info/infodoc.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-09-09 15:13:52 UTC (rev 5814)
+++ trunk/ChangeLog     2014-09-09 15:42:28 UTC (rev 5815)
@@ -19,6 +19,10 @@
        * doc/info-stnd.texi (Variables) <cursor-movement-scrolls>
        <scroll-behaviour>: cursor-movement-scrolls=On by default.
 
+       * info/infodoc.c (info_find_or_create_help_window): Look for help
+       window with get_internal_info_window instead of get_window_of_node.
+       * info/info-utils.c (get_window_of_node): Removed.
+
 2014-09-08  Gavin Smith  <address@hidden>
 
        * info/session.c (info_set_node_of_window): Don't get or remove

Modified: trunk/info/info-utils.c
===================================================================
--- trunk/info/info-utils.c     2014-09-09 15:13:52 UTC (rev 5814)
+++ trunk/info/info-utils.c     2014-09-09 15:42:28 UTC (rev 5815)
@@ -1800,19 +1800,6 @@
 
   return win;
 }
-
-/* Return a window displaying the node NODE. */
-WINDOW *
-get_window_of_node (NODE *node)
-{
-  WINDOW *win = NULL;
-
-  for (win = windows; win; win = win->next)
-    if (win->node == node)
-      break;
-
-  return win;
-}
 
 /* Flexible Text Buffer */
 

Modified: trunk/info/info-utils.h
===================================================================
--- trunk/info/info-utils.h     2014-09-09 15:13:52 UTC (rev 5814)
+++ trunk/info/info-utils.h     2014-09-09 15:42:28 UTC (rev 5815)
@@ -106,9 +106,6 @@
    Info window. */
 extern WINDOW *get_internal_info_window (char *name);
 
-/* Return a window displaying the node NODE. */
-extern WINDOW *get_window_of_node (NODE *node);
-
 struct text_buffer
 {
   char *base;

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2014-09-09 15:13:52 UTC (rev 5814)
+++ trunk/info/infodoc.c        2014-09-09 15:42:28 UTC (rev 5815)
@@ -295,7 +295,7 @@
 {
   int help_is_only_window_p;
   WINDOW *eligible = NULL;
-  WINDOW *help_window = get_window_of_node (internal_info_help_node);
+  WINDOW *help_window = get_internal_info_window (info_help_nodename);
 
   /* Close help window if in it already. */
   if (help_window && help_window == active_window)