From: Chris Allegretta <chrisa@asty.org>
Date: Thu, 10 Jan 2002 13:47:04 +0000 (+0000)
Subject: - Add Meta-A as alternate keyystroke for ^^ for people with non-US keyboards and... 
X-Git-Tag: v1.0.8~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=04c3c425ac9bab2bd38193a1126e6c459e9c841c;p=nano.git

- Add Meta-A as alternate keyystroke for ^^ for people with non-US keyboards and Replace hard coded ALT_G and ALT_H values in the replace and goto shortcuts with their macro counterparts NANO_ALT_*_KEY


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

diff --git a/ChangeLog b/ChangeLog
index b0c50943..f797f4c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@ CVS Code -
 	- Better partial word checking code. New function
 	  search.c:is_whole_word(), changes to findnextstr(),
 	  and nano.c:do_int_spell_fix() (Rocco Corsi).
+	- Add Meta-A as alternate keyystroke for ^^ for people with
+	  non-US keyboards.
+- global.c:
+  shorcut_init()
+	- Replace hard coded ALT_G and ALT_H values in the replace
+	  and goto shortcuts with their macro counterparts NANO_ALT_*_KEY.
 - nano.c:
   do_suspend()
 	- Call tcsetattr() to restore the old terminal settings, so
diff --git a/global.c b/global.c
index 2d2193ac..6129e2c5 100644
--- a/global.c
+++ b/global.c
@@ -246,7 +246,7 @@ void shortcut_init(int unjustify)
     else
 	sc_init_one(&main_list[4], NANO_REPLACE_KEY, _("Replace"),
 		    nano_replace_msg,
-		    NANO_ALT_R, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+		    NANO_ALT_REPLACE_KEY, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
 
     sc_init_one(&main_list[5], NANO_WHEREIS_KEY, _("Where Is"),
 		nano_whereis_msg,
@@ -301,7 +301,7 @@ void shortcut_init(int unjustify)
 		nano_refresh_msg, 0, 0, 0, VIEW, total_refresh);
 
     sc_init_one(&main_list[19], NANO_MARK_KEY, _("Mark Text"),
-		nano_mark_msg, 0, 0, 0, NOVIEW, do_mark);
+		nano_mark_msg, NANO_ALT_MARK_KEY, 0, 0, NOVIEW, do_mark);
 
     sc_init_one(&main_list[20], NANO_DELETE_KEY, _("Delete"),
 		nano_delete_msg, 0, KEY_DC,
@@ -317,7 +317,7 @@ void shortcut_init(int unjustify)
     if (ISSET(PICO_MODE))
 	sc_init_one(&main_list[23], NANO_REPLACE_KEY, _("Replace"),
 		    nano_replace_msg,
-		    NANO_ALT_R, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+		    NANO_ALT_REPLACE_KEY, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
     else
 	sc_init_one(&main_list[23], NANO_JUSTIFY_KEY, _("Justify"),
 		    nano_justify_msg, 0, NANO_JUSTIFY_FKEY, 0,
@@ -329,7 +329,7 @@ void shortcut_init(int unjustify)
 
     sc_init_one(&main_list[25], NANO_GOTO_KEY, _("Goto Line"),
 		    nano_goto_msg,
-		    NANO_ALT_G, NANO_GOTO_FKEY, 0, VIEW, do_gotoline_void);
+		    NANO_ALT_GOTO_KEY, NANO_GOTO_FKEY, 0, VIEW, do_gotoline_void);
 
 
 
diff --git a/nano.h b/nano.h
index 73856c1d..6a3e7370 100644
--- a/nano.h
+++ b/nano.h
@@ -221,6 +221,7 @@ know what you're doing */
 #define NANO_FORWARD_KEY	NANO_CONTROL_F
 #define NANO_BACK_KEY		NANO_CONTROL_B
 #define NANO_MARK_KEY		NANO_CONTROL_6
+#define NANO_ALT_MARK_KEY	NANO_ALT_A
 #define NANO_HOME_KEY		NANO_CONTROL_A
 #define NANO_END_KEY		NANO_CONTROL_E
 #define NANO_DELETE_KEY		NANO_CONTROL_D