From dc10ecbbd6b4661c5f88f4aa912ddf9a4c87b9cb Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 15 Mar 2004 20:03:01 +0000 Subject: [PATCH] revert the Meta-P and Meta-N aliases for the paragraph searches for now; Meta-P was being interpreted as such even when it was used for the Prepend toggle at the writeout prompt git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 --- src/global.c | 4 ++-- src/nano.h | 2 -- src/winio.c | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ffc950a..760d693a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,9 +14,6 @@ CVS code - Also add NANO_FIRSTLINE_FKEY and NANO_LASTLINE_FKEY, and tweak the statusbar input routines to handle them and NANO_HELP_FKEY properly. (DLR) - - Add more intuitive Meta-key aliases for moving to the - beginning and ending lines of a paragraph at the search - prompt: Meta-P and Meta-N. (DLR) - Block SIGWINCH after setting up its handler, and only unblock and handle it when we're in a stable state, i.e, when we're waiting for input from the user. New function diff --git a/src/global.c b/src/global.c index 0ca115c0..435eaea4 100644 --- a/src/global.c +++ b/src/global.c @@ -640,12 +640,12 @@ void shortcut_init(int unjustify) #ifndef DISABLE_JUSTIFY /* Translators: try to keep this string under 10 characters long */ sc_init_one(&whereis_list, NANO_PARABEGIN_KEY, _("Beg of Par"), - IFHELP(nano_parabegin_msg, NANO_PARABEGIN_ALTKEY), NANO_NO_KEY, + IFHELP(nano_parabegin_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, do_para_begin); /* Translators: try to keep this string under 10 characters long */ sc_init_one(&whereis_list, NANO_PARAEND_KEY, _("End of Par"), - IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY), NANO_NO_KEY, + IFHELP(nano_paraend_msg, NANO_NO_KEY), NANO_NO_KEY, NANO_NO_KEY, VIEW, do_para_end); #endif diff --git a/src/nano.h b/src/nano.h index e5b6efaa..10b8cf16 100644 --- a/src/nano.h +++ b/src/nano.h @@ -442,9 +442,7 @@ typedef struct historyheadtype { #define NANO_NEXTWORD_KEY NANO_CONTROL_SPACE #define NANO_PREVWORD_KEY NANO_ALT_SPACE #define NANO_PARABEGIN_KEY NANO_CONTROL_W -#define NANO_PARABEGIN_ALTKEY NANO_ALT_P #define NANO_PARAEND_KEY NANO_CONTROL_O -#define NANO_PARAEND_ALTKEY NANO_ALT_N #define NANO_VERBATIM_KEY NANO_ALT_V #ifndef NANO_SMALL diff --git a/src/winio.c b/src/winio.c index 7e34183b..d2614e94 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2056,12 +2056,10 @@ int statusq(int tabs, const shortcut *s, const char *def, break; #ifndef DISABLE_JUSTIFY case NANO_PARABEGIN_KEY: - case NANO_PARABEGIN_ALTKEY: do_para_begin(); resetstatuspos = 1; break; case NANO_PARAEND_KEY: - case NANO_PARAEND_ALTKEY: do_para_end(); resetstatuspos = 1; break; -- 2.39.5