[7447] xrefs_of_manpage

[gavinsmith0123]

Revision: 7447
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7447
Author:   gavin
Date:     2016-10-10 20:58:07 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
xrefs_of_manpage

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-10-09 18:27:45 UTC (rev 7446)
+++ trunk/ChangeLog     2016-10-10 20:58:07 UTC (rev 7447)
@@ -1,5 +1,10 @@
 2016-10-09  Gavin Smith  <address@hidden>
 
+       * info/man.c (xrefs_of_manpage): Allow SGR sequence in manpage
+       name, and fix code checking for two-character manpage section.
+
+2016-10-09  Gavin Smith  <address@hidden>
+
        * Texinfo/Parser.pm (_next_bracketed_or_word): When returning
        a bracketed element, change the type of the in-tree element
        from 'bracketed' to 'bracketed_def_content' instead of creating

Modified: trunk/info/man.c
===================================================================
--- trunk/info/man.c    2016-10-09 18:27:45 UTC (rev 7446)
+++ trunk/info/man.c    2016-10-10 20:58:07 UTC (rev 7447)
@@ -528,7 +528,9 @@
         if (!isalnum (s.buffer[name_end])
             && s.buffer[name_end] != '_'
             && s.buffer[name_end] != '.'
-            && s.buffer[name_end] != '-')
+            && s.buffer[name_end] != '-'
+            && s.buffer[name_end] != '\033' /* possible in SGR sequence */
+            && s.buffer[name_end] != '[')
           goto skip;
 
       section = position;
@@ -542,7 +544,7 @@
         ; /* end of buffer */
       else if (s.buffer[section + 2] == ')')
         section_end = section + 3;
-      else if (!isalpha(s.buffer[section + 3]))
+      else if (!isalpha(s.buffer[section + 2]))
         ;
       else if (s.buffer[section + 3] == ')')
         section_end = section + 4;