[6175] close help window if tutorial is loaded

[Gavin D. Smith]

Revision: 6175
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6175
Author:   gavin
Date:     2015-03-03 16:08:05 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
close help window if tutorial is loaded

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-03-03 15:51:18 UTC (rev 6174)
+++ trunk/ChangeLog     2015-03-03 16:08:05 UTC (rev 6175)
@@ -1,5 +1,10 @@
 2015-03-03  Gavin Smith  <address@hidden>
 
+       * info/infodoc.c (info_get_info_help_node): If in a help
+       window, close it before loading the tutorial.
+
+2015-03-03  Gavin Smith  <address@hidden>
+
        * info/info-stnd.texi (infokey format): Example .infokey changed 
        to include "ESC u" for clearing search highlight.  Line setting 
        scroll-step to its default value removed.  Suggest keys Up and 

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2015-03-03 15:51:18 UTC (rev 6174)
+++ trunk/info/infodoc.c        2015-03-03 16:08:05 UTC (rev 6175)
@@ -369,6 +369,18 @@
       }
   }
 
+  /* If there is more than one window on the screen, check if the user typed 
+     "H" for help message before typing "h" for tutorial.  If so, close help 
+     message so the tutorial will not be in a small window. */
+  if (windows->next)
+    {
+      WINDOW *help_window = get_internal_info_window (info_help_nodename);
+      if (help_window && help_window == active_window)
+        {
+          info_delete_window_internal (help_window);
+        }
+    }
+
   /* If the current window is small, show the small screen help. */
   if (active_window->height < 24)
     nodename = "Help-Small-Screen";