mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Not defining nor accepting shortcuts for functions that are disabled. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4849 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-05-09 12:20:20 +00:00
parent 59cd3e682b
commit d16f9af022
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* src/winio.c (get_mouseinput): Count only shortcuts that are actually
shown, so that clicking on the ones after ^T (Speller/Linter) will work
again correctly. This fixes the second part of Savannah bug #42093.
* src/global.c (shortcut_init, strtosc): Do not define nor accept
shortcuts for functions that are disabled.
2014-05-06 Benno Schulenberg <bensberg@justemail.net>
* doc/texinfo/nano.texi: Let makeinfo figure out the node pointers.

16
src/global.c
View File

@ -1095,18 +1095,26 @@ void shortcut_init(void)
add_to_sclist(MMAIN, "M-O", do_toggle_void, MORE_SPACE, TRUE);
add_to_sclist(MMAIN, "M-S", do_toggle_void, SMOOTH_SCROLL, TRUE);
add_to_sclist(MMAIN, "M-P", do_toggle_void, WHITESPACE_DISPLAY, TRUE);
#ifndef DISABLE_COLOR
add_to_sclist(MMAIN, "M-Y", do_toggle_void, NO_COLOR_SYNTAX, TRUE);
#endif
add_to_sclist(MMAIN, "M-H", do_toggle_void, SMART_HOME, TRUE);
add_to_sclist(MMAIN, "M-I", do_toggle_void, AUTOINDENT, TRUE);
add_to_sclist(MMAIN, "M-K", do_toggle_void, CUT_TO_END, TRUE);
#ifndef DISABLE_WRAPPING
add_to_sclist(MMAIN, "M-L", do_toggle_void, NO_WRAP, TRUE);
#endif
add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE);
add_to_sclist(MMAIN, "M-Q", do_toggle_void, TABS_TO_SPACES, TRUE);
add_to_sclist(MMAIN, "M-B", do_toggle_void, BACKUP_FILE, TRUE);
#ifndef DISABLE_MULTIBUFFER
add_to_sclist(MMAIN, "M-F", do_toggle_void, MULTIBUFFER, TRUE);
#endif
#ifndef DISABLE_MOUSE
add_to_sclist(MMAIN, "M-M", do_toggle_void, USE_MOUSE, TRUE);
#endif
add_to_sclist(MMAIN, "M-N", do_toggle_void, NO_CONVERT, TRUE);
add_to_sclist(MMAIN, "M-Z", do_toggle_void, SUSPEND, TRUE);
#endif /* !NANO_TINY */
@ -1352,10 +1360,12 @@ sc *strtosc(char *input)
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = WHITESPACE_DISPLAY;
#ifndef DISABLE_COLOR
} else if (!strcasecmp(input, "nosyntax")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = NO_COLOR_SYNTAX;
#endif
} else if (!strcasecmp(input, "smarthome")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
@ -1368,10 +1378,12 @@ sc *strtosc(char *input)
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = CUT_TO_END;
#ifndef DISABLE_WRAPPING
} else if (!strcasecmp(input, "nowrap")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = NO_WRAP;
#endif
} else if (!strcasecmp(input, "softwrap")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
@ -1384,14 +1396,18 @@ sc *strtosc(char *input)
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = BACKUP_FILE;
#ifndef DISABLE_MULTIBUFFER
} else if (!strcasecmp(input, "multibuffer")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = MULTIBUFFER;
#endif
#ifndef DISABLE_MOUSE
} else if (!strcasecmp(input, "mouse")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;
s->toggle = USE_MOUSE;
#endif
} else if (!strcasecmp(input, "noconvert")) {
s->scfunc = do_toggle_void;
s->execute = FALSE;