[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

           memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
           memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
           memcpy (swap_buf  [row].t, prev_swap_buf  [row].t, sizeof (text_t) * common_col);
           memcpy (swap_buf  [row].r, prev_swap_buf  [row].r, sizeof (rend_t) * common_col);
+          swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
-          swap_buf [row].l = prev_swap_buf [row].l;
+          swap_buf [row].f = prev_swap_buf [row].f;
         }
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
               scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
               memcpy (dst.t, src.t, sizeof (text_t) * common_col);
               memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
-              dst.l = common_col;
+              dst.l = min (src.l, ncol);
+              dst.f = src.f;
             }
           for (int row = prev_nrow; row < nrow; row++)
             scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines