consistency fix: the convention for shortcuts lists other than the main

list is apparently to only allow meta shortcuts as toggles, so only
allow the meta shortcuts for searching for the beginning and end of the
paragraph and justifying the entire file to go in the main list

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

diff --git a/ChangeLog b/ChangeLog
index 63ad5760a20d7f0606947dd24e06c03bef1a0f50..8fb35276a0ec8e58f6a01db5b7e043d512b28bcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,11 +39,11 @@ CVS code -
          edit_update(), rename open_the_file() to open_file() since the
          latter has been removed, and rename load_a_file() to
          load_buffer().
-       - Add alternative shortcuts for moving to the beginning and end
-         of a paragraph and justifying the entire file: Meta-(
-         (Meta-9), Meta-) (Meta-0), and Meta-J, respectively.  Also add
-         these functions to the main shortcut list, as Pico's practice
-         of putting them in the search menu is rather odd. (DLR)
+       - Add alternative shortcuts to the main list for moving to the
+         beginning and end of a paragraph and justifying the entire
+         file: Meta-( (Meta-9), Meta-) (Meta-0), and Meta-J,
+         respectively.  Do this because Pico's practice of putting these
+         shortcuts in the search menu is rather odd. (DLR)
        - Turn off extended input processing (the IEXTEN termios flag)
          as nano 1.2.x does.  New function disable_extended_input();
          changes to terminal_init(). (DLR)

diff --git a/src/global.c b/src/global.c
index e0f4801290634b17c0d0c6648c5f9fbeb66ae426..90225378a8c030b9d8d93c420369090ad2a9dae2 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -624,17 +624,17 @@ 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_msg,
-       IFHELP(nano_parabegin_msg, NANO_PARABEGIN_ALTKEY1), NANO_NO_KEY,
-       NANO_PARABEGIN_ALTKEY2, VIEW, do_para_begin);
+       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_msg,
-       IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY1), NANO_NO_KEY,
-       NANO_PARAEND_ALTKEY2, VIEW, do_para_end);
+       IFHELP(nano_paraend_msg, NANO_NO_KEY), NANO_NO_KEY,
+       NANO_NO_KEY, VIEW, do_para_end);
 
     /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&whereis_list, NANO_FULLJUSTIFY_KEY, fulljstify_msg,
-       IFHELP(nano_fulljustify_msg, NANO_FULLJUSTIFY_ALTKEY), NANO_NO_KEY,
+       IFHELP(nano_fulljustify_msg, NANO_NO_KEY), NANO_NO_KEY,
        NANO_NO_KEY, NOVIEW, do_full_justify);
 #endif
 

diff --git a/src/winio.c b/src/winio.c
index 834f478e61e15aff5408d821b97ad092ff933458..aaa0f4fa6d1f6f3be641852e3c3c63f591049d21 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -3026,19 +3026,14 @@ int statusq(int allowtabs, const shortcut *s, const char *def,
        break;
 #ifndef DISABLE_JUSTIFY
     case NANO_PARABEGIN_KEY:
-    case NANO_PARABEGIN_ALTKEY1:
-    case NANO_PARABEGIN_ALTKEY2:
        do_para_begin();
        resetstatuspos = TRUE;
        break;
     case NANO_PARAEND_KEY:
-    case NANO_PARAEND_ALTKEY1:
-    case NANO_PARAEND_ALTKEY2:
        do_para_end();
        resetstatuspos = TRUE;
        break;
     case NANO_FULLJUSTIFY_KEY:
-    case NANO_FULLJUSTIFY_ALTKEY:
        if (!ISSET(VIEW_MODE))
            do_full_justify();
        resetstatuspos = TRUE;