From 8f1a657a37046508a3742980820f329ad5ae9f93 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 1 Mar 2018 09:44:38 +0100 Subject: [PATCH] bindings: revert the ^/ changes, as ^/ is not always Go-To-Line On a Linux console, ^/ produces Backspace, making it unrebindable. This fixes https://savannah.gnu.org/bugs/?53248. --- src/global.c | 4 +--- syntax/nanohelp.nanorc | 2 +- syntax/nanorc.nanorc | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/global.c b/src/global.c index 14cccb7f..2d4d04f0 100644 --- a/src/global.c +++ b/src/global.c @@ -441,8 +441,6 @@ int keycode_from_string(const char *keystring) if (keystring[0] == '^') { if (strcasecmp(keystring, "^Space") == 0) return 0; - if (strcasecmp(keystring, "^/") == 0) - return '_' - 64; if (strlen(keystring) == 2) return keystring[1] - 64; else @@ -1112,7 +1110,7 @@ void shortcut_init(void) #endif add_to_sclist(MMAIN, "^C", 0, do_cursorpos_void, 0); add_to_sclist(MMAIN, "F11", 0, do_cursorpos_void, 0); - add_to_sclist(MMAIN, "^/", 0, do_gotolinecolumn_void, 0); + add_to_sclist(MMAIN, "^_", 0, do_gotolinecolumn_void, 0); add_to_sclist(MMAIN, "M-G", 0, do_gotolinecolumn_void, 0); add_to_sclist(MMAIN, "F13", 0, do_gotolinecolumn_void, 0); add_to_sclist(MMAIN|MHELP|MBROWSER|MLINTER, "^Y", 0, do_page_up, 0); diff --git a/syntax/nanohelp.nanorc b/syntax/nanohelp.nanorc index 9307b446..d53bb87d 100644 --- a/syntax/nanohelp.nanorc +++ b/syntax/nanohelp.nanorc @@ -4,7 +4,7 @@ syntax nanohelp # Key combos: -color cyan "\^[]4-8A-Z^\_/◀▶▲▼]" "[◀▶▲▼]" "(\^|M-)Space" "\" # Quoted indicators: diff --git a/syntax/nanorc.nanorc b/syntax/nanorc.nanorc index d8c8b593..9140c1a3 100644 --- a/syntax/nanorc.nanorc +++ b/syntax/nanorc.nanorc @@ -10,8 +10,8 @@ icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comm icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|atblanks|autoindent|backup|backwards|boldtext|casesensitive|constantshow|cutfromcursor|fill[[:space:]]+-?[[:digit:]]+|historylog|linenumbers|locking|morespace|mouse|multibuffer|noconvert|nohelp|nopauses|nonewlines|nowrap|positionlog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|showcursor|smarthome|smooth|softwrap|suspend|tabsize[[:space:]]+[1-9][0-9]*|tabstospaces|tempfile|trimblanks|unix|view|wordbounds)\>" icolor yellow "^[[:space:]]*set[[:space:]]+((error|function|key|number|selected|status|title)color)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|punct|quotestr|selectedcolor|speller|statuscolor|titlecolor|whitespace|wordchars)[[:space:]]+" -icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]0-9\^/_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" -icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]0-9\^/_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" +icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" +icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|linter|formatter)[[:space:]]+.*$" icolor brightgreen "^[[:space:]]*(syntax|linter|formatter)[[:space:]]+[^[:blank:]]+" icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|extendsyntax)\>"