[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.111 and 1.112

version 1.111, 2017/02/09 09:33:15 version 1.112, 2017/02/09 10:09:14
Line 1153 
Line 1153 
                 return;                  return;
         ctx->cells++;          ctx->cells++;
   
         /* Flush any existing scrolling. */  
         screen_write_collect_flush(ctx, 1);  
   
         /* If the width is zero, combine onto the previous character. */          /* If the width is zero, combine onto the previous character. */
         if (width == 0) {          if (width == 0) {
                   screen_write_collect_flush(ctx, 0);
                 if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {                  if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) {
                         screen_write_cursormove(ctx, xx, s->cy);                          screen_write_cursormove(ctx, xx, s->cy);
                         screen_write_initctx(ctx, &ttyctx);                          screen_write_initctx(ctx, &ttyctx);
Line 1166 
Line 1164 
                 }                  }
                 return;                  return;
         }          }
   
           /* Flush any existing scrolling. */
           screen_write_collect_flush(ctx, 1);
   
         /* If this character doesn't fit, ignore it. */          /* If this character doesn't fit, ignore it. */
         if ((~s->mode & MODE_WRAP) &&          if ((~s->mode & MODE_WRAP) &&
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.112