fix more breakage

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

diff --git a/src/global.c b/src/global.c
index a11a9dc777110a3c97e55856651ba7397dc46f39..7445e2e0c40d1769f83059468aa0af466827f0c5 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -458,7 +458,7 @@ void shortcut_init(bool unjustify)
        /* TRANSLATORS: Try to keep this at most 10 characters. */
        openfile != NULL && openfile != openfile->next ? N_("Close") :
 #endif
-       exit_msg, IFHELP(nano_exit_msg, FALSE), NANO_NO_KEY),
+       exit_msg, IFHELP(nano_exit_msg, FALSE), NANO_NO_KEY,
        NANO_EXIT_FKEY, NANO_NO_KEY, VIEW, do_exit);
 
     /* TRANSLATORS: Try to keep this at most 10 characters. */
@@ -593,7 +593,7 @@ void shortcut_init(bool unjustify)
        NANO_NO_KEY, VIEW, do_home);
 
     sc_init_one(&main_list, NANO_END_KEY, N_("End"),
-       IFHELP(nano_end_msg, FALSE), NANO_NO_KEY), NANO_NO_KEY,
+       IFHELP(nano_end_msg, FALSE), NANO_NO_KEY, NANO_NO_KEY,
        NANO_NO_KEY, VIEW, do_end);
 
 #ifndef DISABLE_JUSTIFY
@@ -784,8 +784,8 @@ void shortcut_init(bool unjustify)
 
     /* TRANSLATORS: Try to keep this at most 12 characters. */
     sc_init_one(&replace_list, NANO_TOOTHERSEARCH_KEY, N_("No Replace"),
-       IFHELP(nano_whereis_msg, FALSE), NANO_NO_KEY),
-       NANO_REPLACE_FKEY, NANO_NO_KEY, VIEW, NULL);
+       IFHELP(nano_whereis_msg, FALSE), NANO_NO_KEY, NANO_REPLACE_FKEY,
+       NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&replace_list, NANO_TOGOTOLINE_KEY, go_to_line_msg,
        IFHELP(nano_gotoline_msg, FALSE), NANO_NO_KEY,

diff --git a/src/nano.h b/src/nano.h
index 75efe5de2f0cf815c8c023893c7e155ed23b905f..b3a87c6cb55446118adf980c14c03e8aa5f28dd6 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -557,10 +557,10 @@ typedef struct rcoption {
 #define NANO_CUTTILLEND_ALTKEY NANO_ALT_T
 #define NANO_PARABEGIN_KEY     NANO_CONTROL_W
 #define NANO_PARABEGIN_ALTKEY  NANO_ALT_LPAREN
-#define NANO_PARABEGIN_ALTKEY  NANO_ALT_9
+#define NANO_PARABEGIN_ALTKEY2 NANO_ALT_9
 #define NANO_PARAEND_KEY       NANO_CONTROL_O
 #define NANO_PARAEND_ALTKEY    NANO_ALT_RPAREN
-#define NANO_PARAEND_ALTKEY    NANO_ALT_0
+#define NANO_PARAEND_ALTKEY2   NANO_ALT_0
 #define NANO_FULLJUSTIFY_KEY   NANO_CONTROL_U
 #define NANO_FULLJUSTIFY_ALTKEY        NANO_ALT_J
 #define NANO_VERBATIM_KEY      NANO_ALT_V