[5630] avoid completions window in history

[Gavin D. Smith]

Revision: 5630
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5630
Author:   gavin
Date:     2014-06-01 22:08:12 +0000 (Sun, 01 Jun 2014)
Log Message:
-----------
avoid completions window in history

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/echo-area.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-01 21:33:12 UTC (rev 5629)
+++ trunk/ChangeLog     2014-06-01 22:08:12 UTC (rev 5630)
@@ -5,6 +5,13 @@
        (info_split_window): Copy the NODE object when creating a new
        window.
 
+       * info/echo-area.c (restore_calling_window): Call forget_node to
+       properly erase completions window from window history and restore
+       previous node.
+       (ea_possible_completions): Call info_set_node_of_window instead
+       of window_set_node_of_window to save point and pagetop.
+       (calling_window_point, calling_window_pagetop): Delete unused.
+
 2014-06-01  Gavin Smith  <address@hidden>
 
        * info/session.c (info_print_node, print_node): print_node merged

Modified: trunk/info/echo-area.c
===================================================================
--- trunk/info/echo-area.c      2014-06-01 21:33:12 UTC (rev 5629)
+++ trunk/info/echo-area.c      2014-06-01 22:08:12 UTC (rev 5630)
@@ -77,8 +77,6 @@
    entering the echo area. */
 static WINDOW *calling_window = NULL;
 static NODE *calling_window_node = NULL;
-static long calling_window_point = 0;
-static long calling_window_pagetop = 0;
 
 /* Remember the node and pertinent variables of the calling window. */
 static void
@@ -91,8 +89,6 @@
     {
       calling_window = window;
       calling_window_node = window->node;
-      calling_window_point = window->point;
-      calling_window_pagetop = window->pagetop;
     }
 }
 
@@ -112,9 +108,7 @@
 
       if (win == calling_window && win == compwin)
         {
-          window_set_node_of_window (calling_window, calling_window_node);
-          calling_window->point = calling_window_point;
-          calling_window->pagetop = calling_window_pagetop;
+          forget_node (win);
           compwin = NULL;
           break;
         }
@@ -1099,11 +1093,8 @@
           }
 
         if (compwin->node != possible_completions_output_node)
-          {
-            window_set_node_of_window
-              (compwin, possible_completions_output_node);
-            remember_window_and_node (compwin);
-          }
+          info_set_node_of_window
+            (compwin, possible_completions_output_node);
 
         display_update_display (windows);
       }