[BACK]Return to screen-write.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/screen-write.c between version 1.41 and 1.42

version 1.41, 2009/12/03 22:50:10 version 1.42, 2010/04/06 21:35:44
Line 1009 
Line 1009 
         }          }
   
         /* Check this will fit on the current line and wrap if not. */          /* Check this will fit on the current line and wrap if not. */
         if (s->cx > screen_size_x(s) - width) {          if ((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) {
                 screen_write_linefeed(ctx, 1);                  screen_write_linefeed(ctx, 1);
                 s->cx = 0;      /* carriage return */                  s->cx = 0;      /* carriage return */
         }          }
   
         /* Sanity checks. */          /* Sanity checks. */
         if (s->cx > screen_size_x(s) - 1 || s->cy > screen_size_y(s) - 1)          if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - 1)
               || s->cy > screen_size_y(s) - 1)
                 return;                  return;
   
         /* Handle overwriting of UTF-8 characters. */          /* Handle overwriting of UTF-8 characters. */

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.42