diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-03-20 13:45:18 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-03-20 13:45:18 +0000 |
| commit | 31ae09efa042d9cbe79df36c83890c806c9bd626 (patch) | |
| tree | 048a94d907f34a79e4889b2e74d5f4f71c04d82d | |
| parent | 066575fd5ae6ffe5b1a7c8c54a7189ecac9cdec0 (diff) | |
| parent | 67d2335130295f626cc87468fc069ecdedf2d92a (diff) | |
Merge branch 'obsd-master'
Conflicts:
utf8.c
| -rw-r--r-- | cmd-show-messages.c | 4 | ||||
| -rw-r--r-- | window-choose.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cmd-show-messages.c b/cmd-show-messages.c index 143218ba..c88e0511 100644 --- a/cmd-show-messages.c +++ b/cmd-show-messages.c @@ -80,8 +80,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/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); |