circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-17 18:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-10-11 10:01:19 +01:00
commit 4efd41f3af
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mode-tree.c
View File

@ -774,11 +774,13 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
case KEYC_UP: case KEYC_UP:
case 'k': case 'k':
case KEYC_WHEELUP_PANE: case KEYC_WHEELUP_PANE:
case '\020': /* C-p */
mode_tree_up(mtd, 1); mode_tree_up(mtd, 1);
break; break;
case KEYC_DOWN: case KEYC_DOWN:
case 'j': case 'j':
case KEYC_WHEELDOWN_PANE: case KEYC_WHEELDOWN_PANE:
case '\016': /* C-n */
mode_tree_down(mtd, 1); mode_tree_down(mtd, 1);
break; break;
case KEYC_PPAGE: case KEYC_PPAGE:

5
window-tree.c
View File

@ -434,7 +434,10 @@ window_tree_build(void *modedata, u_int sort_type, uint64_t *tag,
*tag = (uint64_t)data->fs.wl; *tag = (uint64_t)data->fs.wl;
break; break;
case WINDOW_TREE_PANE: case WINDOW_TREE_PANE:
*tag = (uint64_t)data->fs.wp; if (window_count_panes(data->fs.wl->window) == 1)
*tag = (uint64_t)data->fs.wl;
else
*tag = (uint64_t)data->fs.wp;
break; break;
} }
} }