[5634] remember_window_and_node static

[Gavin D. Smith]

Revision: 5634
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5634
Author:   gavin
Date:     2014-06-03 15:55:10 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
remember_window_and_node static

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-03 15:51:24 UTC (rev 5633)
+++ trunk/ChangeLog     2014-06-03 15:55:10 UTC (rev 5634)
@@ -1,5 +1,11 @@
-2014-06-01  Gavin Smith  <address@hidden>
+2014-06-03  Gavin Smith  <address@hidden>
 
+       * info/footnotes.c (info_get_or_remove_footnotes): Call
+       info_set_node_of_window instead of window_set_node_of_window.
+       * info/session.c (remember_window_and_node): Declared static.
+
+2014-06-03  Gavin Smith  <address@hidden>
+
        * info/pseudotty.c: Call posix_openpt instead of getpt.
 
        * info/t/Init-intera.inc: Don't redirect stderr.  Set

Modified: trunk/info/footnotes.c
===================================================================
--- trunk/info/footnotes.c      2014-06-03 15:51:24 UTC (rev 5633)
+++ trunk/info/footnotes.c      2014-06-03 15:55:10 UTC (rev 5634)
@@ -252,13 +252,12 @@
      make that window be the number of lines appearing in the footnotes. */
   if (new_footnotes && fn_win)
     {
-      window_set_node_of_window (fn_win, new_footnotes);
+      info_set_node_of_window (fn_win, new_footnotes);
+      add_gcable_pointer (new_footnotes->contents);
+      /* TODO: Make sure new_footnotes->references are freed properly. */
 
       window_change_window_height
         (fn_win, fn_win->line_count - fn_win->height);
-
-      remember_window_and_node (fn_win);
-      add_gcable_pointer (new_footnotes->contents);
     }
 
   if (!new_footnotes)

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-06-03 15:51:24 UTC (rev 5633)
+++ trunk/info/session.c        2014-06-03 15:55:10 UTC (rev 5634)
@@ -322,7 +322,7 @@
 
 /* Remember this node, the currently displayed pagetop, and the current
    location of point in this window. */
-void
+static void
 remember_window_and_node (WINDOW *win)
 {
   WINDOW_STATE *new;

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-06-03 15:51:24 UTC (rev 5633)
+++ trunk/info/session.h        2014-06-03 15:55:10 UTC (rev 5634)
@@ -76,7 +76,6 @@
 extern unsigned char info_get_input_char (void);
 extern unsigned char info_get_another_input_char (void);
 extern unsigned char info_input_pending_p (void);
-extern void remember_window_and_node (WINDOW *window);
 extern void set_window_pagetop (WINDOW *window, int desired_top);
 extern void info_set_node_of_window (WINDOW *window, NODE *node);
 extern void initialize_keyseq (void);