in nano.h, rename NANO_.*ALTKEY to NANO_.*METAKEY, for consistency

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

ChangeLog

@@ -2,7 +2,8 @@ CVS code -
 - nano.h:
 	- Rename NANO_ALT_REPLACE_KEY to NANO_REPLACE_ALTKEY, for
 	  consistency. (DLR)
-	- Rename NANO_ALT_.* to NANO_META_.*, for consistency. (DLR)
+	- Rename NANO_ALT_.* and NANO_.*ALTKEY to NANO_META_.* and
+	  NANO_.*METAKEY, for consistency. (DLR)
 - BUGS:
 	- Miscellaneous cosmetic fixes. (DLR)
 

src/browser.c

@@ -203,11 +203,11 @@ char *do_browser(char *path, DIR *dir)
 		if (selected > filelist_len - 1)
 		    selected = filelist_len - 1;
 		break;
-	    case NANO_FIRSTFILE_ALTKEY:
+	    case NANO_FIRSTFILE_METAKEY:
 		if (meta_key)
 		    selected = 0;
 		break;
-	    case NANO_LASTFILE_ALTKEY:
+	    case NANO_LASTFILE_METAKEY:
 		if (meta_key)
 		    selected = filelist_len - 1;
 		break;

src/global.c

@@ -558,21 +558,21 @@ void shortcut_init(bool unjustify)
 	nano_disabled_msg);
 
     sc_init_one(&main_list, NANO_GOTOLINE_KEY, go_to_line_msg,
-	IFSCHELP(nano_gotoline_msg, FALSE, NANO_GOTOLINE_ALTKEY),
+	IFSCHELP(nano_gotoline_msg, FALSE, NANO_GOTOLINE_METAKEY),
 	NANO_GOTOLINE_FKEY, NANO_NO_KEY, VIEW,
 	do_gotolinecolumn_void);
 
     sc_init_one(&main_list, NANO_REPLACE_KEY, replace_msg
 #ifndef NANO_TINY
-	, IFSCHELP(nano_replace_msg, FALSE, NANO_REPLACE_ALTKEY)
+	, IFSCHELP(nano_replace_msg, FALSE, NANO_REPLACE_METAKEY)
 #else
-	, IFSCHELP(nano_replace_msg, TRUE, NANO_REPLACE_ALTKEY)
+	, IFSCHELP(nano_replace_msg, TRUE, NANO_REPLACE_METAKEY)
 #endif
 	, NANO_REPLACE_FKEY, NANO_NO_KEY, NOVIEW, do_replace);
 
 #ifndef NANO_TINY
     sc_init_one(&main_list, NANO_MARK_KEY, N_("Mark Text"),
-	IFSCHELP(nano_mark_msg, FALSE, NANO_MARK_ALTKEY),
+	IFSCHELP(nano_mark_msg, FALSE, NANO_MARK_METAKEY),
 	NANO_MARK_FKEY, NANO_NO_KEY, VIEW, do_mark);
 
     sc_init_one(&main_list, NANO_NO_KEY, whereis_next_msg,
@@ -581,7 +581,7 @@ void shortcut_init(bool unjustify)
 
     sc_init_one(&main_list, NANO_NO_KEY, N_("Copy Text"),
 	IFSCHELP(nano_copy_msg, FALSE, NANO_COPY_KEY), NANO_NO_KEY,
-	NANO_COPY_ALTKEY, NOVIEW, do_copy_text);
+	NANO_COPY_METAKEY, NOVIEW, do_copy_text);
 
     sc_init_one(&main_list, NANO_NO_KEY, N_("Indent Text"),
 	IFSCHELP(nano_indent_msg, FALSE, NANO_INDENT_KEY), NANO_NO_KEY,
@@ -628,21 +628,21 @@ void shortcut_init(bool unjustify)
 
 #ifndef DISABLE_JUSTIFY
     sc_init_one(&main_list, NANO_NO_KEY, beg_of_par_msg,
-	IFSCHELP(nano_parabegin_msg, FALSE, NANO_PARABEGIN_ALTKEY),
-	NANO_NO_KEY, NANO_PARABEGIN_ALTKEY2, VIEW, do_para_begin_void);
+	IFSCHELP(nano_parabegin_msg, FALSE, NANO_PARABEGIN_METAKEY),
+	NANO_NO_KEY, NANO_PARABEGIN_METAKEY2, VIEW, do_para_begin_void);
 
     sc_init_one(&main_list, NANO_NO_KEY, end_of_par_msg,
-	IFSCHELP(nano_paraend_msg, FALSE, NANO_PARAEND_ALTKEY),
-	NANO_NO_KEY, NANO_PARAEND_ALTKEY2, VIEW, do_para_end_void);
+	IFSCHELP(nano_paraend_msg, FALSE, NANO_PARAEND_METAKEY),
+	NANO_NO_KEY, NANO_PARAEND_METAKEY2, VIEW, do_para_end_void);
 #endif
 
     sc_init_one(&main_list, NANO_NO_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_NO_KEY, NANO_FIRSTLINE_ALTKEY2, VIEW, do_first_line);
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_NO_KEY, NANO_FIRSTLINE_METAKEY2, VIEW, do_first_line);
 
     sc_init_one(&main_list, NANO_NO_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, TRUE, NANO_LASTLINE_ALTKEY),
-	NANO_NO_KEY, NANO_LASTLINE_ALTKEY2, VIEW, do_last_line);
+	IFSCHELP(nano_lastline_msg, TRUE, NANO_LASTLINE_METAKEY),
+	NANO_NO_KEY, NANO_LASTLINE_METAKEY2, VIEW, do_last_line);
 
 #ifndef NANO_TINY
     sc_init_one(&main_list, NANO_NO_KEY, N_("Find Other Bracket"),
@@ -651,22 +651,22 @@ void shortcut_init(bool unjustify)
 
     sc_init_one(&main_list, NANO_NO_KEY, N_("Scroll Up"),
 	IFSCHELP(nano_scrollup_msg, FALSE, NANO_SCROLLUP_KEY),
-	NANO_NO_KEY, NANO_SCROLLUP_ALTKEY, VIEW, do_scroll_up);
+	NANO_NO_KEY, NANO_SCROLLUP_METAKEY, VIEW, do_scroll_up);
 
     sc_init_one(&main_list, NANO_NO_KEY, N_("Scroll Down"),
 	IFSCHELP(nano_scrolldown_msg, TRUE, NANO_SCROLLDOWN_KEY),
-	NANO_NO_KEY, NANO_SCROLLDOWN_ALTKEY, VIEW, do_scroll_down);
+	NANO_NO_KEY, NANO_SCROLLDOWN_METAKEY, VIEW, do_scroll_down);
 #endif
 
 #ifdef ENABLE_MULTIBUFFER
     sc_init_one(&main_list, NANO_NO_KEY, N_("Previous File"),
 	IFSCHELP(nano_prevfile_msg, FALSE, NANO_PREVFILE_KEY),
-	NANO_NO_KEY, NANO_PREVFILE_ALTKEY, VIEW,
+	NANO_NO_KEY, NANO_PREVFILE_METAKEY, VIEW,
 	switch_to_prev_buffer_void);
 
     sc_init_one(&main_list, NANO_NO_KEY, N_("Next File"),
 	IFSCHELP(nano_nextfile_msg, TRUE, NANO_NEXTFILE_KEY),
-	NANO_NO_KEY, NANO_NEXTFILE_ALTKEY, VIEW,
+	NANO_NO_KEY, NANO_NEXTFILE_METAKEY, VIEW,
 	switch_to_next_buffer_void);
 #endif
 
@@ -696,13 +696,13 @@ void shortcut_init(bool unjustify)
 
 #ifndef NANO_TINY
     sc_init_one(&main_list, NANO_NO_KEY, N_("CutTillEnd"),
-	IFSCHELP(nano_cut_till_end_msg, TRUE, NANO_CUTTILLEND_ALTKEY),
+	IFSCHELP(nano_cut_till_end_msg, TRUE, NANO_CUTTILLEND_METAKEY),
 	NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_cut_till_end);
 #endif
 
 #ifndef DISABLE_JUSTIFY
     sc_init_one(&main_list, NANO_NO_KEY, fulljstify_msg,
-	IFSCHELP(nano_fulljustify_msg, FALSE, NANO_FULLJUSTIFY_ALTKEY),
+	IFSCHELP(nano_fulljustify_msg, FALSE, NANO_FULLJUSTIFY_METAKEY),
 	NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify);
 #endif
 
@@ -737,13 +737,13 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&whereis_list, NANO_FIRSTLINE_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_ALTKEY2, VIEW,
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_METAKEY2, VIEW,
 	do_first_line);
 
     sc_init_one(&whereis_list, NANO_LASTLINE_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_ALTKEY),
-	NANO_LASTLINE_FKEY, NANO_LASTLINE_ALTKEY2, VIEW, do_last_line);
+	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_METAKEY),
+	NANO_LASTLINE_FKEY, NANO_LASTLINE_METAKEY2, VIEW, do_last_line);
 
     sc_init_one(&whereis_list, NANO_TOOTHERSEARCH_KEY, replace_msg,
 	IFSCHELP(nano_replace_msg, FALSE, NANO_NO_KEY),
@@ -755,12 +755,12 @@ void shortcut_init(bool unjustify)
 
 #ifndef DISABLE_JUSTIFY
     sc_init_one(&whereis_list, NANO_PARABEGIN_KEY, beg_of_par_msg,
-	IFSCHELP(nano_parabegin_msg, FALSE, NANO_PARABEGIN_ALTKEY),
-	NANO_NO_KEY, NANO_PARABEGIN_ALTKEY2, VIEW, do_para_begin_void);
+	IFSCHELP(nano_parabegin_msg, FALSE, NANO_PARABEGIN_METAKEY),
+	NANO_NO_KEY, NANO_PARABEGIN_METAKEY2, VIEW, do_para_begin_void);
 
     sc_init_one(&whereis_list, NANO_PARAEND_KEY, end_of_par_msg,
-	IFSCHELP(nano_paraend_msg, FALSE, NANO_PARAEND_ALTKEY),
-	NANO_NO_KEY, NANO_PARAEND_ALTKEY2, VIEW, do_para_end_void);
+	IFSCHELP(nano_paraend_msg, FALSE, NANO_PARAEND_METAKEY),
+	NANO_NO_KEY, NANO_PARAEND_METAKEY2, VIEW, do_para_end_void);
 #endif
 
 #ifndef NANO_TINY
@@ -791,7 +791,7 @@ void shortcut_init(bool unjustify)
 
 #ifndef DISABLE_JUSTIFY
     sc_init_one(&whereis_list, NANO_FULLJUSTIFY_KEY, fulljstify_msg,
-	IFSCHELP(nano_fulljustify_msg, FALSE, NANO_FULLJUSTIFY_ALTKEY),
+	IFSCHELP(nano_fulljustify_msg, FALSE, NANO_FULLJUSTIFY_METAKEY),
 	NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify);
 #endif
 
@@ -812,13 +812,13 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&replace_list, NANO_FIRSTLINE_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_ALTKEY2, VIEW,
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_METAKEY2, VIEW,
 	do_first_line);
 
     sc_init_one(&replace_list, NANO_LASTLINE_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_ALTKEY),
-	NANO_LASTLINE_FKEY, NANO_LASTLINE_ALTKEY2, VIEW, do_last_line);
+	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_METAKEY),
+	NANO_LASTLINE_FKEY, NANO_LASTLINE_METAKEY2, VIEW, do_last_line);
 
     /* TRANSLATORS: Try to keep this at most 12 characters. */
     sc_init_one(&replace_list, NANO_TOOTHERSEARCH_KEY, N_("No Replace"),
@@ -868,13 +868,13 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&replace_list_2, NANO_FIRSTLINE_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_ALTKEY2, VIEW,
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_METAKEY2, VIEW,
 	do_first_line);
 
     sc_init_one(&replace_list_2, NANO_LASTLINE_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_ALTKEY),
-	NANO_LASTLINE_FKEY, NANO_LASTLINE_ALTKEY2, VIEW, do_last_line);
+	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_METAKEY),
+	NANO_LASTLINE_FKEY, NANO_LASTLINE_METAKEY2, VIEW, do_last_line);
 
 #ifndef NANO_TINY
     sc_init_one(&replace_list_2, NANO_PREVLINE_KEY, prev_history_msg,
@@ -903,13 +903,13 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&gotoline_list, NANO_FIRSTLINE_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_ALTKEY2, VIEW,
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_FIRSTLINE_FKEY, NANO_FIRSTLINE_METAKEY2, VIEW,
 	do_first_line);
 
     sc_init_one(&gotoline_list, NANO_LASTLINE_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_ALTKEY),
-	NANO_LASTLINE_FKEY, NANO_LASTLINE_ALTKEY2, VIEW, do_last_line);
+	IFSCHELP(nano_lastline_msg, FALSE, NANO_LASTLINE_METAKEY),
+	NANO_LASTLINE_FKEY, NANO_LASTLINE_METAKEY2, VIEW, do_last_line);
 
     sc_init_one(&gotoline_list, NANO_TOOTHERWHEREIS_KEY,
 	N_("Go To Text"), IFSCHELP(nano_whereis_msg, FALSE,
@@ -1082,12 +1082,12 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&help_list, NANO_NO_KEY, first_line_msg,
-	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_ALTKEY),
-	NANO_NO_KEY, NANO_FIRSTLINE_ALTKEY2, VIEW, NULL);
+	IFSCHELP(nano_firstline_msg, FALSE, NANO_FIRSTLINE_METAKEY),
+	NANO_NO_KEY, NANO_FIRSTLINE_METAKEY2, VIEW, NULL);
 
     sc_init_one(&help_list, NANO_NO_KEY, last_line_msg,
-	IFSCHELP(nano_lastline_msg, TRUE, NANO_LASTLINE_ALTKEY),
-	NANO_NO_KEY, NANO_LASTLINE_ALTKEY2, VIEW, NULL);
+	IFSCHELP(nano_lastline_msg, TRUE, NANO_LASTLINE_METAKEY),
+	NANO_NO_KEY, NANO_LASTLINE_METAKEY2, VIEW, NULL);
 #endif
 
 #ifndef DISABLE_SPELLER
@@ -1136,16 +1136,16 @@ void shortcut_init(bool unjustify)
 	NANO_NEXTPAGE_FKEY, NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&browser_list, NANO_NO_KEY, first_file_msg,
-	IFSCHELP(nano_firstfile_msg, FALSE, NANO_FIRSTFILE_ALTKEY),
-	NANO_NO_KEY, NANO_FIRSTFILE_ALTKEY2, VIEW, NULL);
+	IFSCHELP(nano_firstfile_msg, FALSE, NANO_FIRSTFILE_METAKEY),
+	NANO_NO_KEY, NANO_FIRSTFILE_METAKEY2, VIEW, NULL);
 
     sc_init_one(&browser_list, NANO_NO_KEY, last_file_msg,
-	IFSCHELP(nano_lastfile_msg, FALSE, NANO_LASTFILE_ALTKEY),
-	NANO_NO_KEY, NANO_LASTFILE_ALTKEY2, VIEW, NULL);
+	IFSCHELP(nano_lastfile_msg, FALSE, NANO_LASTFILE_METAKEY),
+	NANO_NO_KEY, NANO_LASTFILE_METAKEY2, VIEW, NULL);
 
     /* TRANSLATORS: Try to keep this at most 12 characters. */
     sc_init_one(&browser_list, NANO_GOTODIR_KEY, N_("Go To Dir"),
-	IFSCHELP(nano_gotodir_msg, FALSE, NANO_GOTODIR_ALTKEY),
+	IFSCHELP(nano_gotodir_msg, FALSE, NANO_GOTODIR_METAKEY),
 	NANO_GOTODIR_FKEY, NANO_NO_KEY, VIEW, NULL);
 
     free_shortcutage(&whereis_file_list);
@@ -1165,13 +1165,13 @@ void shortcut_init(bool unjustify)
 	NANO_NO_KEY, VIEW, NULL);
 
     sc_init_one(&whereis_file_list, NANO_FIRSTFILE_KEY, first_file_msg,
-	IFSCHELP(nano_firstfile_msg, FALSE, NANO_FIRSTFILE_ALTKEY),
-	NANO_FIRSTFILE_FKEY, NANO_FIRSTFILE_ALTKEY2, VIEW,
+	IFSCHELP(nano_firstfile_msg, FALSE, NANO_FIRSTFILE_METAKEY),
+	NANO_FIRSTFILE_FKEY, NANO_FIRSTFILE_METAKEY2, VIEW,
 	do_first_file);
 
     sc_init_one(&whereis_file_list, NANO_LASTFILE_KEY, last_file_msg,
-	IFSCHELP(nano_lastfile_msg, FALSE, NANO_LASTFILE_ALTKEY),
-	NANO_LASTFILE_FKEY, NANO_LASTFILE_ALTKEY2, VIEW, do_last_file);
+	IFSCHELP(nano_lastfile_msg, FALSE, NANO_LASTFILE_METAKEY),
+	NANO_LASTFILE_FKEY, NANO_LASTFILE_METAKEY2, VIEW, do_last_file);
 
 #ifndef NANO_SMALL
     sc_init_one(&whereis_file_list, NANO_NO_KEY, case_sens_msg,

src/help.c

@@ -159,11 +159,11 @@ void do_help(void (*refresh_func)(void))
 		if (line + (editwinrows - 1) < last_line)
 		    line++;
 		break;
-	    case NANO_FIRSTLINE_ALTKEY:
+	    case NANO_FIRSTLINE_METAKEY:
 		if (meta_key)
 		    line = 0;
 		break;
-	    case NANO_LASTLINE_ALTKEY:
+	    case NANO_LASTLINE_METAKEY:
 		if (meta_key) {
 		    if (line + (editwinrows - 1) < last_line)
 			line = last_line - (editwinrows - 1);

src/nano.h

@@ -480,10 +480,10 @@ typedef struct rcoption {
 #define NANO_WRITEOUT_FKEY		KEY_F(3)
 #define NANO_GOTOLINE_KEY		NANO_CONTROL_7
 #define NANO_GOTOLINE_FKEY		KEY_F(13)
-#define NANO_GOTOLINE_ALTKEY		NANO_META_G
+#define NANO_GOTOLINE_METAKEY		NANO_META_G
 #define NANO_GOTODIR_KEY		NANO_CONTROL_7
 #define NANO_GOTODIR_FKEY		KEY_F(13)
-#define NANO_GOTODIR_ALTKEY		NANO_META_G
+#define NANO_GOTODIR_METAKEY		NANO_META_G
 #define NANO_TOGOTOLINE_KEY		NANO_CONTROL_T
 #define NANO_HELP_KEY			NANO_CONTROL_G
 #define NANO_HELP_FKEY			KEY_F(1)
@@ -495,7 +495,7 @@ typedef struct rcoption {
 #define NANO_REGEXP_KEY			NANO_META_R
 #define NANO_REPLACE_KEY		NANO_CONTROL_4
 #define NANO_REPLACE_FKEY		KEY_F(14)
-#define NANO_REPLACE_ALTKEY		NANO_META_R
+#define NANO_REPLACE_METAKEY		NANO_META_R
 #define NANO_TOOTHERSEARCH_KEY		NANO_CONTROL_R
 #define NANO_PREVPAGE_KEY		NANO_CONTROL_Y
 #define NANO_PREVPAGE_FKEY		KEY_F(7)
@@ -504,7 +504,7 @@ typedef struct rcoption {
 #define NANO_CUT_KEY			NANO_CONTROL_K
 #define NANO_CUT_FKEY			KEY_F(9)
 #define NANO_COPY_KEY			NANO_META_CARET
-#define NANO_COPY_ALTKEY		NANO_META_6
+#define NANO_COPY_METAKEY		NANO_META_6
 #define NANO_UNCUT_KEY			NANO_CONTROL_U
 #define NANO_UNCUT_FKEY			KEY_F(10)
 #define NANO_CURSORPOS_KEY		NANO_CONTROL_C
@@ -513,20 +513,20 @@ typedef struct rcoption {
 #define NANO_SPELL_FKEY			KEY_F(12)
 #define NANO_FIRSTLINE_KEY		NANO_PREVPAGE_KEY
 #define NANO_FIRSTLINE_FKEY		NANO_PREVPAGE_FKEY
-#define NANO_FIRSTLINE_ALTKEY		NANO_META_BACKSLASH
-#define NANO_FIRSTLINE_ALTKEY2		NANO_META_PIPE
+#define NANO_FIRSTLINE_METAKEY		NANO_META_BACKSLASH
+#define NANO_FIRSTLINE_METAKEY2		NANO_META_PIPE
 #define NANO_FIRSTFILE_KEY		NANO_FIRSTLINE_KEY
 #define NANO_FIRSTFILE_FKEY		NANO_FIRSTLINE_FKEY
-#define NANO_FIRSTFILE_ALTKEY		NANO_FIRSTLINE_ALTKEY
-#define NANO_FIRSTFILE_ALTKEY2		NANO_FIRSTLINE_ALTKEY2
+#define NANO_FIRSTFILE_METAKEY		NANO_FIRSTLINE_METAKEY
+#define NANO_FIRSTFILE_METAKEY2		NANO_FIRSTLINE_METAKEY2
 #define NANO_LASTLINE_KEY		NANO_NEXTPAGE_KEY
 #define NANO_LASTLINE_FKEY		NANO_NEXTPAGE_FKEY
-#define NANO_LASTLINE_ALTKEY		NANO_META_SLASH
-#define NANO_LASTLINE_ALTKEY2		NANO_META_QUESTION
+#define NANO_LASTLINE_METAKEY		NANO_META_SLASH
+#define NANO_LASTLINE_METAKEY2		NANO_META_QUESTION
 #define NANO_LASTFILE_KEY		NANO_LASTLINE_KEY
 #define NANO_LASTFILE_FKEY		NANO_LASTLINE_FKEY
-#define NANO_LASTFILE_ALTKEY		NANO_LASTLINE_ALTKEY
-#define NANO_LASTFILE_ALTKEY2		NANO_LASTLINE_ALTKEY2
+#define NANO_LASTFILE_METAKEY		NANO_LASTLINE_METAKEY
+#define NANO_LASTFILE_METAKEY2		NANO_LASTLINE_METAKEY2
 #define NANO_REFRESH_KEY		NANO_CONTROL_L
 #define NANO_JUSTIFY_KEY		NANO_CONTROL_J
 #define NANO_JUSTIFY_FKEY		KEY_F(4)
@@ -537,7 +537,7 @@ typedef struct rcoption {
 #define NANO_FORWARD_KEY		NANO_CONTROL_F
 #define NANO_BACK_KEY			NANO_CONTROL_B
 #define NANO_MARK_KEY			NANO_CONTROL_6
-#define NANO_MARK_ALTKEY		NANO_META_A
+#define NANO_MARK_METAKEY		NANO_META_A
 #define NANO_MARK_FKEY			KEY_F(15)
 #define NANO_HOME_KEY			NANO_CONTROL_A
 #define NANO_END_KEY			NANO_CONTROL_E
@@ -552,26 +552,26 @@ typedef struct rcoption {
 #define NANO_APPEND_KEY			NANO_META_A
 #define NANO_PREPEND_KEY		NANO_META_P
 #define NANO_PREVFILE_KEY		NANO_META_LCARET
-#define NANO_PREVFILE_ALTKEY		NANO_META_COMMA
+#define NANO_PREVFILE_METAKEY		NANO_META_COMMA
 #define NANO_NEXTFILE_KEY		NANO_META_RCARET
-#define NANO_NEXTFILE_ALTKEY		NANO_META_PERIOD
+#define NANO_NEXTFILE_METAKEY		NANO_META_PERIOD
 #define NANO_BRACKET_KEY		NANO_META_RBRACKET
 #define NANO_NEXTWORD_KEY		NANO_CONTROL_SPACE
 #define NANO_PREVWORD_KEY		NANO_META_SPACE
 #define NANO_WORDCOUNT_KEY		NANO_META_D
 #define NANO_SCROLLUP_KEY		NANO_META_MINUS
 #define NANO_SCROLLDOWN_KEY		NANO_META_PLUS
-#define NANO_SCROLLUP_ALTKEY		NANO_META_UNDERSCORE
-#define NANO_SCROLLDOWN_ALTKEY		NANO_META_EQUALS
-#define NANO_CUTTILLEND_ALTKEY		NANO_META_T
+#define NANO_SCROLLUP_METAKEY		NANO_META_UNDERSCORE
+#define NANO_SCROLLDOWN_METAKEY		NANO_META_EQUALS
+#define NANO_CUTTILLEND_METAKEY		NANO_META_T
 #define NANO_PARABEGIN_KEY		NANO_CONTROL_W
-#define NANO_PARABEGIN_ALTKEY		NANO_META_LPARENTHESIS
-#define NANO_PARABEGIN_ALTKEY2		NANO_META_9
+#define NANO_PARABEGIN_METAKEY		NANO_META_LPARENTHESIS
+#define NANO_PARABEGIN_METAKEY2		NANO_META_9
 #define NANO_PARAEND_KEY		NANO_CONTROL_O
-#define NANO_PARAEND_ALTKEY		NANO_META_RPARENTHESIS
-#define NANO_PARAEND_ALTKEY2		NANO_META_0
+#define NANO_PARAEND_METAKEY		NANO_META_RPARENTHESIS
+#define NANO_PARAEND_METAKEY2		NANO_META_0
 #define NANO_FULLJUSTIFY_KEY		NANO_CONTROL_U
-#define NANO_FULLJUSTIFY_ALTKEY		NANO_META_J
+#define NANO_FULLJUSTIFY_METAKEY	NANO_META_J
 #define NANO_VERBATIM_KEY		NANO_META_V
 
 /* Toggles do not exist if NANO_TINY is defined. */