[5331] Bind display-file to C-g in vi mode.

[Sergey Poznyakoff]

Revision: 5331
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5331
Author:   gray
Date:     2013-08-20 08:08:30 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Bind display-file to C-g in vi mode.

* info/infomap.c (default_vi_like_info_keys): Bind display-file to
C-g and abort to C-c.
* info/session.c (info_gc_file_buffers): Fix null pointer dereference.
* NEWS: Update.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-19 17:24:02 UTC (rev 5330)
+++ trunk/ChangeLog     2013-08-20 08:08:30 UTC (rev 5331)
@@ -1,3 +1,12 @@
+2013-08-20  Sergey Poznyakoff  <address@hidden>
+
+       Bind display-file to C-g in vi mode.
+
+       * info/infomap.c (default_vi_like_info_keys): Bind display-file to
+       C-g and abort to C-c.
+       * info/session.c (info_gc_file_buffers): Fix null pointer dereference.
+       * NEWS: Update.
+
 2013-08-19  Karl Berry  <address@hidden>
 
        * doc/texinfo.texi (@t{@@unnumbered @@appendix}): mention special

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2013-08-19 17:24:02 UTC (rev 5330)
+++ trunk/NEWS  2013-08-20 08:08:30 UTC (rev 5331)
@@ -35,7 +35,9 @@
     searches skip the lines displayed on the screen, i.e.,
     forward searches (}) start at the beginning of the next page, and
     backward searches ({) start at the end of the previous page.
-
+  . new command '=' (C-g in vi mode) shows full file name of the node
+    being displayed and position in it.
+  
 * Distribution: automake-1.14, gettext-0.18.3.1.
 
 

Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c        2013-08-19 17:24:02 UTC (rev 5330)
+++ trunk/info/infomap.c        2013-08-20 08:08:30 UTC (rev 5331)
@@ -572,15 +572,16 @@
   '8', NUL,                       A_info_add_digit_to_numeric_arg,
   '9', NUL,                       A_info_add_digit_to_numeric_arg,
   '-', NUL,                       A_info_add_digit_to_numeric_arg,
-  '=', NUL,                       A_info_display_file,
   TAB, NUL,                       A_info_move_to_next_xref,
   LFD, NUL,                       A_info_down_line,
   RET, NUL,                       A_info_down_line,
   CONTROL('a'), NUL,              A_info_beginning_of_line,
   CONTROL('b'), NUL,              A_info_scroll_backward_page_only,
+  CONTROL('c'), NUL,              A_info_abort_key,
   CONTROL('d'), NUL,              A_info_scroll_half_screen_down,
   CONTROL('e'), NUL,              A_info_down_line,
   CONTROL('f'), NUL,              A_info_scroll_forward_page_only,
+  CONTROL('g'), NUL,              A_info_display_file,
   CONTROL('k'), NUL,              A_info_up_line,
   CONTROL('l'), NUL,              A_info_redraw_display,
   CONTROL('n'), NUL,              A_info_down_line,
@@ -749,7 +750,6 @@
   DEL, NUL,                       A_info_scroll_backward,
   '{', NUL,                       A_info_search_previous,
   '}', NUL,                       A_info_search_next,
-  CONTROL('g'), NUL,              A_info_abort_key,
   SK_ESCAPE, SK_UP_ARROW, NUL,    A_info_up_line,
   SK_ESCAPE, SK_DOWN_ARROW, NUL,  A_info_down_line,
 };

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2013-08-19 17:24:02 UTC (rev 5330)
+++ trunk/info/session.c        2013-08-20 08:08:30 UTC (rev 5331)
@@ -4734,8 +4734,9 @@
         {
           for (i = 0; iw->nodes && iw->nodes[i]; i++)
             {
-              if ((FILENAME_CMP (fb->fullpath, iw->nodes[i]->filename) == 0) ||
-                  (FILENAME_CMP (fb->filename, iw->nodes[i]->filename) == 0))
+              if (iw->nodes[i]->filename &&
+                 ((FILENAME_CMP (fb->fullpath, iw->nodes[i]->filename) == 0) ||
+                  (FILENAME_CMP (fb->filename, iw->nodes[i]->filename) == 0)))
                 {
                   fb_referenced_p = 1;
                   break;