add more intuitive Meta-key aliases for ^W^W and ^W^O

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1651 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 25b33e390745378643e13a151928ef9d9705fc80..50a9b35d6459b7756e2e3aac36eb8dc4015375f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ CVS code -
        - Add NANO_UNJUSTIFY_FKEY (the same as NANO_UNCUT_FKEY) to the
          shortcut list, and tweak the unjustify routine to use it.
          (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)
 - files.c:
   add_open_files()
        - Make the saving of marked status in open_files->file_flags

diff --git a/src/global.c b/src/global.c
index 93843cf9dcac60fe311481d23565098c237716be..4e4ec3774106e8d2fedd09eb1c1c0c6b450e1095 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -636,12 +636,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_NO_KEY), NANO_NO_KEY,
+               IFHELP(nano_parabegin_msg, NANO_PARABEGIN_ALTKEY), 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_NO_KEY), NANO_NO_KEY,
+               IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY), NANO_NO_KEY,
                NANO_NO_KEY, VIEW, do_para_end);
 #endif
 

diff --git a/src/nano.h b/src/nano.h
index cf8645f3a2ea6399e43294c22743bffd2eab129b..8287307c04f62eab26d20ab9b887f96522e58cdf 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -432,7 +432,9 @@ 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 6fcefd938899d8778dae863046f570f3be126011..fbae044e5c59c86910d2eba6baa5c94d9012254d 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2030,10 +2030,12 @@ 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;