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

diff --git a/ChangeLog b/ChangeLog
index 3ffc950ad2f201fc660ee8d4c3d040f490f432d7..760d693a325f1dd8ea57e878a8826d4e9efa1d52 100644 (file)
--- 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 0ca115c05ed12cce8cc4ca13b138d28368b8753c..435eaea49d4d174f0fce730c7cf71f5097a5966c 100644 (file)
--- 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 e5b6efaac15955787089c6e4ba4aabadd3f68347..10b8cf1657c26be32c12817dbad446f22ab264d2 100644 (file)
--- 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 7e34183b89d7c52277407054b0d7eb18c374223b..d2614e94c778c7b1c365dc0fcf77817ad6e61a21 100644 (file)
--- 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;