circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Do not restore history flag if it was never set.

Browse Source
This commit is contained in:
nicm
2020-04-07 13:55:24 +00:00
parent eff881b15a
commit 1c8f7c1f7a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
screen.c
View File

@@ -536,6 +536,7 @@ screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor)
grid_view_clear(s->grid, 0, 0, sx, sy, 8); grid_view_clear(s->grid, 0, 0, sx, sy, 8);
s->saved_flags = s->grid->flags;
s->grid->flags &= ~GRID_HISTORY; s->grid->flags &= ~GRID_HISTORY;
} }
@@ -579,7 +580,8 @@ screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor)
* Turn history back on (so resize can use it) and then resize back to * Turn history back on (so resize can use it) and then resize back to
* the current size. * the current size.
*/ */
s->grid->flags |= GRID_HISTORY; if (s->saved_flags & GRID_HISTORY)
s->grid->flags |= GRID_HISTORY;
if (sy > s->saved_grid->sy || sx != s->saved_grid->sx) if (sy > s->saved_grid->sy || sx != s->saved_grid->sx)
screen_resize(s, sx, sy, 1); screen_resize(s, sx, sy, 1);

1
tmux.h
View File

@@ -761,6 +761,7 @@ struct screen {
u_int saved_cy; u_int saved_cy;
struct grid *saved_grid; struct grid *saved_grid;
struct grid_cell saved_cell; struct grid_cell saved_cell;
int saved_flags;
bitstr_t *tabs; bitstr_t *tabs;
struct screen_sel *sel; struct screen_sel *sel;