- Add Meta-A as alternate keyystroke for ^^ for people with non-US keyboards and...

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 b0c5094386b74ea92062b64dca13380d512e98ed..f797f4c0821412037bc3c11852e87710cae137ac 100644 (file)
--- 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 2d2193ac9a8d330f70308e5d9d56da333d020e2a..6129e2c550121b2fe9cb0e950a9cfa6001791612 100644 (file)
--- 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 73856c1d79e3eb3d55d07b58a83b40d2113b315e..6a3e7370a2fa97f16ff49af0793c06ba0970a0f0 100644 (file)
--- 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