diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
| commit | da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf (patch) | |
| tree | cf9c86c3218659faf46e606a1e38bc6ebb570dcd /mode-tree.c | |
| parent | 5a501a8ae27c2d0128870caa48c5708e97528567 (diff) | |
| parent | b90a9fcd13f4434aed0fe1785d619aa668bbc77d (diff) | |
| download | rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.gz rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.bz2 rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.zip | |
Merge branch 'master' into 3.0-rc
Diffstat (limited to 'mode-tree.c')
| -rw-r--r-- | mode-tree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mode-tree.c b/mode-tree.c index 75034675..03a91ef8 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -480,7 +480,7 @@ mode_tree_add(struct mode_tree_data *mtd, struct mode_tree_item *parent, saved = mode_tree_find_item(&mtd->saved, tag); if (saved != NULL) { - if (parent == NULL || (parent != NULL && parent->expanded)) + if (parent == NULL || parent->expanded) mti->tagged = saved->tagged; mti->expanded = saved->expanded; } else if (expanded == -1) @@ -933,6 +933,7 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key, case '\016': /* C-n */ mode_tree_down(mtd, 1); break; + case 'g': case KEYC_PPAGE: case '\002': /* C-b */ for (i = 0; i < mtd->height; i++) { @@ -941,6 +942,7 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key, mode_tree_up(mtd, 1); } break; + case 'G': case KEYC_NPAGE: case '\006': /* C-f */ for (i = 0; i < mtd->height; i++) { @@ -1019,6 +1021,8 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key, mode_tree_build(mtd); } break; + case '?': + case '/': case '\023': /* C-s */ mtd->references++; status_prompt_set(c, "(search) ", "", |