[5760] dont' call window_adjust_pagetop in info_search_in_node_internal

[Gavin D. Smith]

Revision: 5760
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5760
Author:   gavin
Date:     2014-08-20 12:32:07 +0000 (Wed, 20 Aug 2014)
Log Message:
-----------
dont' call window_adjust_pagetop in info_search_in_node_internal

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-08-20 12:07:50 UTC (rev 5759)
+++ trunk/ChangeLog     2014-08-20 12:32:07 UTC (rev 5760)
@@ -1,5 +1,11 @@
 2014-08-20  Gavin Smith  <address@hidden>
 
+       * info/session.c (info_search_in_node_internal): Don't call
+       window_adjust_pagetop.
+       (info_search_1, incremental_search): Call it here instead.
+
+2014-08-20  Gavin Smith  <address@hidden>
+
        * info/indices.c (do_info_index_search, info_virtual_index): Remove
        check against min_search_length.
        * info/session.c (info_search_1): Don't allocate for search_string

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-08-20 12:07:50 UTC (rev 5759)
+++ trunk/info/session.c        2014-08-20 12:32:07 UTC (rev 5760)
@@ -3583,7 +3583,6 @@
         new_point = matches[match_index].rm_so;
 
       window->point = new_point;
-      window_adjust_pagetop (window);
     }
   return result;
 }
@@ -3829,23 +3828,13 @@
           break;
         }
 
-  old_pagetop = active_window->pagetop;
   for (result = 0; result == 0 && count--; )
     result = info_search_internal (search_string,
                                    active_window, direction, case_sensitive,
                                   &start_off);
 
-  if (result == 0 && old_pagetop != active_window->pagetop)
-    {
-      int new_pagetop;
+  window_adjust_pagetop (window);
 
-      new_pagetop = active_window->pagetop;
-      active_window->pagetop = old_pagetop;
-      set_window_pagetop (active_window, new_pagetop);
-      if (auto_footnotes_p)
-        info_get_or_remove_footnotes (active_window);
-    }
-
   /* Perhaps free the unreferenced file buffers that were searched, but
      not retained. */
   gc_file_buffers_and_nodes ();
@@ -4149,6 +4138,7 @@
               window->pagetop = mystate.pagetop;
               set_window_pagetop (window, newtop);
             }
+          window_adjust_pagetop (window);
           display_update_one_window (window);
           display_cursor_at_point (window);
         }