[6516] fix xref split over lines

[Gavin D. Smith]

Revision: 6516
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6516
Author:   gavin
Date:     2015-08-12 20:28:43 +0000 (Wed, 12 Aug 2015)
Log Message:
-----------
fix xref split over lines

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/Makefile.am
    trunk/info/info-utils.c
    trunk/info/t/infodir/intera.info

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-12 15:59:05 UTC (rev 6515)
+++ trunk/ChangeLog     2015-08-12 20:28:43 UTC (rev 6516)
@@ -1,5 +1,11 @@
 2015-08-12  Gavin Smith  <address@hidden>
 
+       * info/info-utils.c (scan_reference_target): Always canonicalize
+       target nodename.
+       * info/t/xref-across-lines.sh: New test.
+
+2015-08-12  Gavin Smith  <address@hidden>
+
        * info/indices.c (apropos_in_all_indices): Check if there is no 
        filename, to avoid crash with "info -k" when there is a 
        malformed dir entry.  Crash reported by Ivan Pacheco, and cause 

Modified: trunk/info/Makefile.am
===================================================================
--- trunk/info/Makefile.am      2015-08-12 15:59:05 UTC (rev 6515)
+++ trunk/info/Makefile.am      2015-08-12 20:28:43 UTC (rev 6516)
@@ -119,6 +119,7 @@
        t/tab-argument.sh \
        t/tab-no-xref.sh \
        t/tab-skip-node.sh \
+       t/xref-across-lines.sh \
        t/body-start.sh \
        t/end-of-line.sh \
        t/goal-column.sh \

Modified: trunk/info/info-utils.c
===================================================================
--- trunk/info/info-utils.c     2015-08-12 15:59:05 UTC (rev 6515)
+++ trunk/info/info-utils.c     2015-08-12 20:28:43 UTC (rev 6516)
@@ -1395,6 +1395,7 @@
           else
             nl_off = 0;
         }
+      canonicalize_whitespace (entry->nodename);
 
       if (entry->filename)
         {

Modified: trunk/info/t/infodir/intera.info
===================================================================
(Binary files differ)