ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: in the tiny version exclude word jumping from the prompts 

In the tiny version, Ctrl+Left and Ctrl+Right are available only
in the editor itself and in the file browser.

This fixes https://savannah.gnu.org/bugs/?51173.
master
Benno Schulenberg 2017-06-04 11:05:08 +02:00
parent 84ff9ebb91
commit 621eb904b3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/global.c
View File

@ -1125,15 +1125,15 @@ void shortcut_init(void)
if (using_utf8()) { if (using_utf8()) {
add_to_sclist(MMOST, "\xE2\x86\x90", KEY_LEFT, do_left, 0); add_to_sclist(MMOST, "\xE2\x86\x90", KEY_LEFT, do_left, 0);
add_to_sclist(MMOST, "\xE2\x86\x92", KEY_RIGHT, do_right, 0); add_to_sclist(MMOST, "\xE2\x86\x92", KEY_RIGHT, do_right, 0);
add_to_sclist(MMOST, "^\xE2\x86\x90", CONTROL_LEFT, do_prev_word_void, 0); add_to_sclist(MSOME, "^\xE2\x86\x90", CONTROL_LEFT, do_prev_word_void, 0);
add_to_sclist(MMOST, "^\xE2\x86\x92", CONTROL_RIGHT, do_next_word_void, 0); add_to_sclist(MSOME, "^\xE2\x86\x92", CONTROL_RIGHT, do_next_word_void, 0);
} else } else
#endif #endif
{ {
add_to_sclist(MMOST, "Left", KEY_LEFT, do_left, 0); add_to_sclist(MMOST, "Left", KEY_LEFT, do_left, 0);
add_to_sclist(MMOST, "Right", KEY_RIGHT, do_right, 0); add_to_sclist(MMOST, "Right", KEY_RIGHT, do_right, 0);
add_to_sclist(MMOST, "^Left", CONTROL_LEFT, do_prev_word_void, 0); add_to_sclist(MSOME, "^Left", CONTROL_LEFT, do_prev_word_void, 0);
add_to_sclist(MMOST, "^Right", CONTROL_RIGHT, do_next_word_void, 0); add_to_sclist(MSOME, "^Right", CONTROL_RIGHT, do_next_word_void, 0);
} }
add_to_sclist(MMOST, "M-Space", 0, do_prev_word_void, 0); add_to_sclist(MMOST, "M-Space", 0, do_prev_word_void, 0);
add_to_sclist(MMOST, "^Space", 0, do_next_word_void, 0); add_to_sclist(MMOST, "^Space", 0, do_next_word_void, 0);

5
src/nano.h
View File

@ -542,6 +542,11 @@ enum
/* This is an abbreviation for all menus except Help and YesNo. */ /* This is an abbreviation for all menus except Help and YesNo. */
#define MMOST (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\ #define MMOST (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|\
MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER) MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MFINDINHELP|MSPELL|MLINTER)
#ifndef NANO_TINY
#define MSOME MMOST
#else
#define MSOME MMAIN|MBROWSER
#endif
/* Basic control codes. */ /* Basic control codes. */
#define TAB_CODE 0x09 #define TAB_CODE 0x09

2
src/rcfile.c
View File

@ -350,7 +350,9 @@ bool is_universal(void (*func))
{ {
if (func == do_left || func == do_right || if (func == do_left || func == do_right ||
func == do_home_void || func == do_end_void || func == do_home_void || func == do_end_void ||
#ifndef NANO_TINY
func == do_prev_word_void || func == do_next_word_void || func == do_prev_word_void || func == do_next_word_void ||
#endif
func == do_verbatim_input || func == do_cut_text_void || func == do_verbatim_input || func == do_cut_text_void ||
func == do_delete || func == do_backspace || func == do_delete || func == do_backspace ||
func == do_tab || func == do_enter) func == do_tab || func == do_enter)