Removing the search-mode toggles from the WHEREISFILE and

REPLACEWITH menus, where they don't belong.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4830 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-05-03 20:09:47 +00:00
parent 523598a342
commit 672821cb68
2 changed files with 8 additions and 6 deletions

View File

@ -5,6 +5,8 @@
* src/global.c (shortcut_init): Unfold long lines consistently. * src/global.c (shortcut_init): Unfold long lines consistently.
* src/global.c (shortcut_init): Order the shortcuts in roughly * src/global.c (shortcut_init): Order the shortcuts in roughly
the same manner as in the help lines, and group them per menu. the same manner as in the help lines, and group them per menu.
* src/global.c (shortcut_init): Remove the search-mode toggles
from the inappropriate WHEREISFILE and REPLACEWITH menus.
2014-04-30 Benno Schulenberg <bensberg@justemail.net> 2014-04-30 Benno Schulenberg <bensberg@justemail.net>
* src/*, doc/*: Update the years in the copyright notices -- there * src/*, doc/*: Update the years in the copyright notices -- there

View File

@ -756,17 +756,17 @@ void shortcut_init(void)
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(case_sens_void, (MWHEREIS|MREPLACE|MWHEREISFILE), add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
N_("Case Sens"), IFSCHELP(nano_case_msg), FALSE, VIEW); N_("Case Sens"), IFSCHELP(nano_case_msg), FALSE, VIEW);
#endif #endif
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
add_to_funcs(regexp_void, (MWHEREIS|MREPLACE|MWHEREISFILE), add_to_funcs(regexp_void, MWHEREIS|MREPLACE,
N_("Regexp"), IFSCHELP(nano_regexp_msg), FALSE, VIEW); N_("Regexp"), IFSCHELP(nano_regexp_msg), FALSE, VIEW);
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
add_to_funcs(backwards_void, (MWHEREIS|MREPLACE|MWHEREISFILE), add_to_funcs(backwards_void, MWHEREIS|MREPLACE,
N_("Backwards"), IFSCHELP(nano_reverse_msg), FALSE, VIEW); N_("Backwards"), IFSCHELP(nano_reverse_msg), FALSE, VIEW);
#endif #endif
@ -1116,9 +1116,9 @@ void shortcut_init(void)
add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0, FALSE); add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-C", case_sens_void, 0, FALSE); add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-R", regexp_void, 0, FALSE); add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "M-B", backwards_void, 0, FALSE); add_to_sclist(MWHEREIS|MREPLACE, "M-B", backwards_void, 0, FALSE);
add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE); add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE);
add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE); add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE);
add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE); add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE);