circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	utf8.c
This commit is contained in:
Thomas Adam
2017-03-20 13:45:18 +00:00
parent 066575fd5a 67d2335130
commit 31ae09efa0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-show-messages.c
View File

@@ -80,8 +80,8 @@ cmd_show_messages_jobs(struct cmdq_item *item, int blank)
cmdq_print(item, "%s", ""); cmdq_print(item, "%s", "");
blank = 0; blank = 0;
} }
cmdq_print(item, "Job %u: %s [fd=%d, pid=%d, status=%d]", cmdq_print(item, "Job %u: %s [fd=%d, pid=%ld, status=%d]",
n, job->cmd, job->fd, job->pid, job->status); n, job->cmd, job->fd, (long)job->pid, job->status);
n++; n++;
} }
return (n != 0); return (n != 0);

10
window-choose.c
View File

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