[6656] q can close a window

[Gavin D. Smith]

Revision: 6656
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6656
Author:   gavin
Date:     2015-09-29 19:51:52 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
q can close a window

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-09-29 19:45:29 UTC (rev 6655)
+++ trunk/ChangeLog     2015-09-29 19:51:52 UTC (rev 6656)
@@ -1,5 +1,11 @@
 2015-09-29  Gavin Smith  <address@hidden>
 
+       * info/session.c (info_quit),
+       * TODO: Make q close a window if there's more than one on the 
+       screen.
+
+2015-09-29  Gavin Smith  <address@hidden>
+
        * info/infomap.c (default_emacs_like_info_keys),
        * info/info-stnd.texi (Searching Commands): Make '?' search 
        backwards, for consistency with 'less'.

Modified: trunk/TODO
===================================================================
--- trunk/TODO  2015-09-29 19:45:29 UTC (rev 6655)
+++ trunk/TODO  2015-09-29 19:51:52 UTC (rev 6656)
@@ -105,7 +105,6 @@
     last one, and be able to toggle display of a node's subnodes.  
     (Could be hard to implement though, because of how much code assumes 
     that only one node is in a window at once.)
-  - Make q quit help, like Less, and :q in Vim.
   - Make DEL exit echo area when it's empty
         
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2015-09-29 19:45:29 UTC (rev 6655)
+++ trunk/info/session.c        2015-09-29 19:51:52 UTC (rev 6656)
@@ -5364,7 +5364,10 @@
 /* Exit from info */
 DECLARE_INFO_COMMAND (info_quit, _("Quit using Info"))
 {
-  quit_info_immediately = 1;
+  if (window->next || window->prev)
+    info_delete_window (window, count);
+  else
+    quit_info_immediately = 1;
 }