From b26523c26dc7cf0a24a1adb787aa1816deb40693 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 30 May 2019 20:54:03 +0000
Subject: Remove a leftover abort and some fixes from cppcheck.

---
 mode-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 75034675..20ac3226 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)
-- 
cgit 


From bf6d1aeaa44775923a72a4da49def96268dfa304 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 19 Jul 2019 07:20:51 +0000
Subject: Add a few vi(1) key aliases, from D Ben Knoble.

---
 mode-tree.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 20ac3226..03a91ef8 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -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) ", "",
-- 
cgit