Making ^G and ^C exit from help, and ^C from the file browser.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4610 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-02-25 21:45:55 +00:00
parent be5ab4e654
commit db906ea121
2 changed files with 6 additions and 3 deletions

View File

@ -3,7 +3,10 @@
* src/global.c - Correcting some translator comments, removal
of a few superfluous blank lines, and some pedantic comment
tweaks (mainly adding missing periods and stars).
* src/global.c - Ordering "Prev Word" and "Next Word" better.
* src/global.c - Ordering "Prev Word" and "Next Word" better.
* src/global.c - Make ^G not only call help but also exit from
it, and make ^C also exit from help and from the file browser.
Also remove two redundant shortcut definitions.
2014-02-25 Mike Frysinger <vapier@gentoo.org>
* src/Makefile.am - Rename 'INCLUDES' to 'AM_CPPFLAGS', since

View File

@ -1286,12 +1286,12 @@ void shortcut_init(bool unjustify)
add_to_sclist(MMAIN, "M-Z", do_toggle_void, SUSPEND, TRUE);
add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE);
#endif
add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0, TRUE);
add_to_sclist(MHELP, "^G", do_exit, 0, TRUE);
add_to_sclist(MGOTOLINE, "^T", gototext_void, 0, FALSE);
add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0, FALSE);
add_to_sclist((MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO|MLINTER),
"^C", do_cancel, 0, FALSE);
add_to_sclist(MHELP, "^X", do_exit, 0, TRUE);
add_to_sclist(MHELP, "F2", do_exit, 0, TRUE);
add_to_sclist(MWRITEFILE, "M-D", dos_format_void, 0, FALSE);
add_to_sclist(MWRITEFILE, "M-M", mac_format_void, 0, FALSE);
add_to_sclist(MWRITEFILE, "M-A", append_void, 0, FALSE);