[5566] process_node_text

[Gavin D. Smith]

Revision: 5566
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5566
Author:   gavin
Date:     2014-05-17 15:32:55 +0000 (Sat, 17 May 2014)
Log Message:
-----------
process_node_text

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-14 16:13:10 UTC (rev 5565)
+++ trunk/ChangeLog     2014-05-17 15:32:55 UTC (rev 5566)
@@ -1,3 +1,8 @@
+2014-05-17  Gavin Smith  <address@hidden>
+
+       * info/window.c (process_node_text): Don't split printed
+       representations like "^X" across lines.
+
 2014-05-14  Gavin Smith  <address@hidden>
 
        * info/window.c (process_node_text): First argument changed from

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2014-05-14 16:13:10 UTC (rev 5565)
+++ trunk/info/window.c 2014-05-17 15:32:55 UTC (rev 5566)
@@ -1551,30 +1551,15 @@
            {
               /* The printed representation of this character extends into
                  the next line. */
+              int i;
 
+              for (i = 0; pl_chars < (win->width - 1); pl_chars++)
+                printed_line[pl_bytes++] = ' ';
+
              carried_over_count = replen;
-             if (replen == 1)
-               {
-                 /* It is a single (possibly multibyte) character */
-                 /* FIXME? */
-                 carried_over_ptr = cur_ptr;
-                 carried_over_len = cur_len;
-               }
-             else
-               {
-                 int i;
-                 
-                 /* Remember the offset of the last character printed out of
-                    REP so that we can carry the character over to the next
-                    line. */
-                 for (i = 0; pl_chars < (win->width - 1);
-                      pl_chars++)
-                   printed_line[pl_bytes++] = cur_ptr[i++];
+              carried_over_ptr = cur_ptr;
+              carried_over_len = cur_len;
 
-                 carried_over_ptr = cur_ptr + i;
-                 carried_over_len = cur_len;
-               }
-
               /* If printing the last character in this window couldn't
                  possibly cause the screen to scroll, place a backslash
                  in the rightmost column. */