[5429] Read .info before first file

[Gavin D. Smith]

Revision: 5429
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5429
Author:   gavin
Date:     2014-04-05 16:29:56 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
Read .info before first file

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-04-05 15:11:48 UTC (rev 5428)
+++ trunk/ChangeLog     2014-04-05 16:29:56 UTC (rev 5429)
@@ -1,6 +1,13 @@
 2014-04-05  Gavin Smith  <address@hidden>
 
+        * session.c (initialize_terminal_and_keymaps, initialize_info_session):
+        Function split out.
+        * info.c (main): Call initialize_terminal_and_keymaps before
+        loading file.  This is needed in case a variable in .infokey affects
+        the loading of the file.
 
+2014-04-05  Gavin Smith  <address@hidden>
+
        * info/info.c (long_options): Specify that --variable takes an
        argument, like its short equivalent -v.
 

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2014-04-05 15:11:48 UTC (rev 5428)
+++ trunk/info/info.c   2014-04-05 16:29:56 UTC (rev 5429)
@@ -721,6 +721,9 @@
   argc -= optind;
   argv += optind;
   
+  /* Load custom key mappings and variable settings */
+  initialize_terminal_and_keymaps ();
+
   if (all_matches_p)
     return all_files (user_filename, argc, argv);
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-04-05 15:11:48 UTC (rev 5428)
+++ trunk/info/session.c        2014-04-05 16:29:56 UTC (rev 5429)
@@ -246,10 +246,9 @@
 /* Found in signals.c */
 extern void initialize_info_signal_handler (void );
 
-/* Initialize the first info session by starting the terminal, window,
-   and display systems.  If CLEAR_SCREEN is 0, don't clear the screen.  */
+/* Initialize terminal, read configuration file .info and set key bindings. */
 void
-initialize_info_session (NODE *node, int clear_screen)
+initialize_terminal_and_keymaps (void)
 {
   char *term_name = getenv ("TERM");
   terminal_initialize_terminal (term_name);
@@ -263,13 +262,20 @@
       exit (EXIT_FAILURE);
     }
 
+  initialize_info_keymaps ();
+}
+
+/* Initialize the first info session by starting the terminal, window,
+   and display systems.  If CLEAR_SCREEN is 0, don't clear the screen.  */
+void
+initialize_info_session (NODE *node, int clear_screen)
+{
   if (clear_screen)
     {
       terminal_prep_terminal ();
       terminal_clear_screen ();
     }
 
-  initialize_info_keymaps ();
   window_initialize_windows (screenwidth, screenheight);
   initialize_info_signal_handler ();
   display_initialize_display (screenwidth, screenheight);

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-04-05 15:11:48 UTC (rev 5428)
+++ trunk/info/session.h        2014-04-05 16:29:56 UTC (rev 5429)
@@ -127,6 +127,7 @@
     char **nodenames);
 extern void begin_info_session (NODE *initial_node);
 extern void info_session (void);
+extern void initialize_terminal_and_keymaps (void);
 extern void initialize_info_session (NODE *node, int clear_screen);
 extern void info_read_and_dispatch (void);
 extern void info_intuit_options_node (WINDOW *window,