texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[7040] fix invalid in infokey


From: Gavin D. Smith
Subject: [7040] fix invalid in infokey
Date: Fri, 04 Mar 2016 19:33:07 +0000

Revision: 7040
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7040
Author:   gavin
Date:     2016-03-04 19:33:07 +0000 (Fri, 04 Mar 2016)
Log Message:
-----------
fix invalid in infokey

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-03-04 18:32:36 UTC (rev 7039)
+++ trunk/ChangeLog     2016-03-04 19:33:07 UTC (rev 7040)
@@ -1,5 +1,12 @@
 2016-03-04  Gavin Smith  <address@hidden>
 
+       * info/infokey.c: Check if key sequence was defined as "invalid" 
+       in infokey file, and if so, record it by saving a pointer to a 
+       null InfoCommand structure.  Broken handling of "invalid" 
+       reported by Ken Brown.
+
+2016-03-04  Gavin Smith  <address@hidden>
+
        * util/dir-example,
        * install-info/install-info.c (ensure_dirfile_exists): Update 
        message in dir node.

Modified: trunk/info/infokey.c
===================================================================
--- trunk/info/infokey.c        2016-03-04 18:32:36 UTC (rev 7039)
+++ trunk/info/infokey.c        2016-03-04 19:33:07 UTC (rev 7040)
@@ -463,9 +463,12 @@
                       int keymap_bind_keyseq (Keymap, int *, KEYMAP_ENTRY *);
 
                       KEYMAP_ENTRY ke;
+                      static InfoCommand invalid_function = { 0 };
                       
                       ke.type = ISFUNC;
-                      ke.value.function = &function_doc_array[a];
+                      ke.value.function = a != A_INVALID
+                                            ? &function_doc_array[a]
+                                            : &invalid_function;
                       To_seq (0);
 
                       if (section == info)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]