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

tweaks: rename a symbol, to match its corresponding option

master
Benno Schulenberg 2018-12-28 17:47:03 +01:00
parent 67c69b2298
commit 997826d794
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nano.c
View File

@ -706,8 +706,8 @@ void window_init(void)
/* In case the terminal shrunk, make sure the status line is clear. */ /* In case the terminal shrunk, make sure the status line is clear. */
wipe_statusbar(); wipe_statusbar();
/* Turn the keypad on for the windows, if necessary. */ /* When not disabled, turn escape-sequence translation on. */
if (!ISSET(REBIND_KEYPAD)) { if (!ISSET(RAW_SEQUENCES)) {
keypad(topwin, TRUE); keypad(topwin, TRUE);
keypad(edit, TRUE); keypad(edit, TRUE);
keypad(bottomwin, TRUE); keypad(bottomwin, TRUE);
@ -1528,7 +1528,7 @@ int get_keycode(const char *keyname, const int standard)
return key_defined(keyvalue); return key_defined(keyvalue);
#endif #endif
#ifdef DEBUG #ifdef DEBUG
if (!ISSET(REBIND_KEYPAD)) if (!ISSET(RAW_SEQUENCES))
fprintf(stderr, "Using fallback keycode for %s\n", keyname); fprintf(stderr, "Using fallback keycode for %s\n", keyname);
#endif #endif
return standard; return standard;
@ -2131,7 +2131,7 @@ int main(int argc, char **argv)
break; break;
#endif #endif
case 'K': case 'K':
SET(REBIND_KEYPAD); SET(RAW_SEQUENCES);
break; break;
case 'L': case 'L':
SET(NO_NEWLINES); SET(NO_NEWLINES);

2
src/nano.h
View File

@ -513,7 +513,7 @@ enum
MULTIBUFFER, MULTIBUFFER,
SMOOTH_SCROLL, SMOOTH_SCROLL,
REBIND_DELETE, REBIND_DELETE,
REBIND_KEYPAD, RAW_SEQUENCES,
NO_CONVERT, NO_CONVERT,
BACKUP_FILE, BACKUP_FILE,
INSECURE_BACKUP, INSECURE_BACKUP,

2
src/rcfile.c
View File

@ -78,7 +78,7 @@ static const rcoption rcopts[] = {
#endif #endif
{"quickblank", QUICK_BLANK}, {"quickblank", QUICK_BLANK},
{"rebinddelete", REBIND_DELETE}, {"rebinddelete", REBIND_DELETE},
{"rebindkeypad", REBIND_KEYPAD}, {"rebindkeypad", RAW_SEQUENCES},
{"regexp", USE_REGEXP}, {"regexp", USE_REGEXP},
#ifdef ENABLE_SPELLER #ifdef ENABLE_SPELLER
{"speller", 0}, {"speller", 0},

4
src/winio.c
View File

@ -1538,7 +1538,7 @@ int *get_verbatim_kbinput(WINDOW *win, size_t *kbinput_len)
* don't get extended keypad values. */ * don't get extended keypad values. */
if (ISSET(PRESERVE)) if (ISSET(PRESERVE))
disable_flow_control(); disable_flow_control();
if (!ISSET(REBIND_KEYPAD)) if (!ISSET(RAW_SEQUENCES))
keypad(win, FALSE); keypad(win, FALSE);
/* Read in one keycode, or one or two escapes. */ /* Read in one keycode, or one or two escapes. */
@ -1557,7 +1557,7 @@ int *get_verbatim_kbinput(WINDOW *win, size_t *kbinput_len)
enable_flow_control(); enable_flow_control();
/* Use the global window pointers, because a resize may have freed /* Use the global window pointers, because a resize may have freed
* the data that the win parameter points to. */ * the data that the win parameter points to. */
if (!ISSET(REBIND_KEYPAD)) { if (!ISSET(RAW_SEQUENCES)) {
keypad(edit, TRUE); keypad(edit, TRUE);
keypad(bottomwin, TRUE); keypad(bottomwin, TRUE);
} }