circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/1741/head
Thomas Adam 2019-04-03 09:02:41 +01:00
parent c9ef144dca f6c54f3f03
commit cb039b986e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cfg.c
View File

@ -101,7 +101,8 @@ start_cfg(void)
cmdq_append(c, cfg_item); cmdq_append(c, cfg_item);
} }
load_cfg(TMUX_CONF, NULL, NULL, 1); if (cfg_file == NULL)
load_cfg(TMUX_CONF, NULL, NULL, 1);
if (cfg_file == NULL && (home = find_home()) != NULL) { if (cfg_file == NULL && (home = find_home()) != NULL) {
xasprintf(&cfg_file, "%s/.tmux.conf", home); xasprintf(&cfg_file, "%s/.tmux.conf", home);

5
screen-write.c
View File

@ -324,7 +324,7 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
/* /*
* Copy from another screen but without the selection stuff. Also assumes the * Copy from another screen but without the selection stuff. Also assumes the
* target region is already big enough and already cleared. * target region is already big enough.
*/ */
void void
screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src, screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
@ -349,8 +349,7 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
grid_get_cell(gd, xx, yy, &gc); grid_get_cell(gd, xx, yy, &gc);
if (xx + gc.data.width > px + nx) if (xx + gc.data.width > px + nx)
break; break;
if (!grid_cells_equal(&gc, &grid_default_cell)) grid_view_set_cell(ctx->s->grid, cx, cy, &gc);
grid_view_set_cell(ctx->s->grid, cx, cy, &gc);
cx++; cx++;
} }
cy++; cy++;