From 481e48d119b0cf2fbf2556a6f4b3f4bbda5fdf7e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 17 Mar 2017 14:41:54 +0000
Subject: Add h and l for collapse and expand in choose mode with vi(1) keys,
 from Gregory Pakosz.

---
 window-choose.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/window-choose.c b/window-choose.c
index 7daddc6f..b736c5b1 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -93,7 +93,7 @@ static const char window_choose_keys_emacs[] = "0123456789"
 	                                       "abcdefghijklmnoprstuvwxyz"
 	                                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 static const char window_choose_keys_vi[] = "0123456789"
-	                                    "abcdefhilmnoprstuvwxyz"
+	                                    "abcdefimnoprstuvwxyz"
 	                                    "ABCDEFIJKMNOPQRSTUVWXYZ";
 
 static void	window_choose_free1(struct window_choose_mode_data *);
@@ -563,8 +563,6 @@ window_choose_translate_key(key_code key)
 	case '\r':
 	case KEYC_BSPACE:
 	case ' ':
-	case KEYC_LEFT:
-	case KEYC_RIGHT:
 	case KEYC_LEFT|KEYC_CTRL:
 	case KEYC_RIGHT|KEYC_CTRL:
 	case KEYC_MOUSEDOWN1_PANE:
@@ -584,12 +582,18 @@ window_choose_translate_key(key_code key)
 	case '\006': /* C-f */
 	case KEYC_NPAGE:
 		return (KEYC_NPAGE);
+	case 'h':
+	case KEYC_LEFT:
+		return (KEYC_LEFT);
 	case 'j':
 	case KEYC_DOWN:
 		return (KEYC_DOWN);
 	case 'k':
 	case KEYC_UP:
 		return (KEYC_UP);
+	case 'l':
+	case KEYC_RIGHT:
+		return (KEYC_RIGHT);
 	case 'g':
 	case KEYC_HOME:
 		return (KEYC_HOME);
-- 
cgit 


From 67d2335130295f626cc87468fc069ecdedf2d92a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 17 Mar 2017 14:51:41 +0000
Subject: Fix a couple of argument types.

---
 cmd-show-messages.c | 4 ++--
 utf8.c              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd-show-messages.c b/cmd-show-messages.c
index bc9fc0db..e0b72b9a 100644
--- a/cmd-show-messages.c
+++ b/cmd-show-messages.c
@@ -81,8 +81,8 @@ cmd_show_messages_jobs(struct cmdq_item *item, int blank)
 			cmdq_print(item, "%s", "");
 			blank = 0;
 		}
-		cmdq_print(item, "Job %u: %s [fd=%d, pid=%d, status=%d]",
-		    n, job->cmd, job->fd, job->pid, job->status);
+		cmdq_print(item, "Job %u: %s [fd=%d, pid=%ld, status=%d]",
+		    n, job->cmd, job->fd, (long)job->pid, job->status);
 		n++;
 	}
 	return (n != 0);
diff --git a/utf8.c b/utf8.c
index ea8c99a2..ac85863a 100644
--- a/utf8.c
+++ b/utf8.c
@@ -112,7 +112,7 @@ utf8_width(wchar_t wc)
 
 	width = wcwidth(wc);
 	if (width < 0 || width > 0xff) {
-		log_debug("Unicode %04x, wcwidth() %d", wc, width);
+		log_debug("Unicode %04lx, wcwidth() %d", (long)wc, width);
 		return (-1);
 	}
 	return (width);
-- 
cgit