diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2015-07-26 11:30:03 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2015-07-26 11:30:03 +0200 |
| commit | 8e6f525b5920b7627ac53de5cd30638c76449825 (patch) | |
| tree | 71bed78fe6b77b0a714da54f4e0066de9ec98022 /src/gui/curses/gui-curses-key.c | |
| parent | 74f1592f218608040f1c09df1764b6dda25fd6f6 (diff) | |
| parent | b87c52240b1dfc4a875c32b292bd1ccf1a3a8956 (diff) | |
| download | weechat-8e6f525b5920b7627ac53de5cd30638c76449825.zip | |
Merge remote-tracking branch 'origin/pr/393'
Diffstat (limited to 'src/gui/curses/gui-curses-key.c')
| -rw-r--r-- | src/gui/curses/gui-curses-key.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index 30705f0d1..b1205b400 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -85,7 +85,7 @@ gui_key_default_bindings (int context) BIND(/* <enter> */ "ctrl-J", "/input return"); BIND(/* <tab> */ "ctrl-I", "/input complete_next"); BIND(/* s-<tab> */ "meta2-Z", "/input complete_previous"); - BIND(/* ^R */ "ctrl-R", "/input search_text"); + BIND(/* ^R */ "ctrl-R", "/input search_text_here"); BIND(/* <backspace> */ "ctrl-H", "/input delete_previous_char"); BIND(/* <backspace> */ "ctrl-?", "/input delete_previous_char"); BIND(/* ^_ */ "ctrl-_", "/input undo"); @@ -228,8 +228,9 @@ gui_key_default_bindings (int context) } else if (context == GUI_KEY_CONTEXT_SEARCH) { - BIND(/* <enter> */ "ctrl-M", "/input search_stop"); - BIND(/* <enter> */ "ctrl-J", "/input search_stop"); + BIND(/* <enter> */ "ctrl-M", "/input search_stop_here"); + BIND(/* <enter> */ "ctrl-J", "/input search_stop_here"); + BIND(/* ^Q */ "ctrl-Q", "/input search_stop"); BIND(/* m-c */ "meta-c", "/input search_switch_case"); BIND(/* ^R */ "ctrl-R", "/input search_switch_regex"); BIND(/* <tab> */ "ctrl-I", "/input search_switch_where"); |