fix breakage and typos

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

diff --git a/ChangeLog b/ChangeLog
index e67130da79b10d6cbb5cef7cc835c851965661a2..a601b0db48dc2c7ea1cb25721f30ada835eb5247 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,8 +74,8 @@ CVS code -
        - In the main shortcut list, move the "Refresh" shortcut down to
          after the "Enter" shortcut, for consistency. (DLR)
        - Add the ability to go to the first and last line of the
-         current file from the main list via Meta-/ (Meta-?) and Meta-\
-         (Meta-|).  Also, make sure all the equivalent shortcuts in the
+         current file from the main list via Meta-\ (Meta-|) and Meta-/
+         (Meta-?).  Also, make sure all the equivalent shortcuts in the
          search, replace, and "Go To Line" lists accept both the meta
          keys and the equivalent function keys. (DLR)
   toggle_init()

diff --git a/src/nano.h b/src/nano.h
index 70b5aacbdcfb8c7af030a0ccabc2561aeab9039d..a45eb0eaccc6125fbe9c9e848e6613ea43a27197 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -499,20 +499,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_ALT_SLASH
-#define NANO_FIRSTLINE_ALTKEY2 NANO_ALT_QUESTION
+#define NANO_FIRSTLINE_ALTKEY  NANO_ALT_BACKSLASH
+#define NANO_FIRSTLINE_ALTKEY2 NANO_ALT_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_LASTLINE_KEY      NANO_NEXTPAGE_KEY
 #define NANO_LASTLINE_FKEY     NANO_NEXTPAGE_FKEY
-#define NANO_LASTLINE_ALTKEY   NANO_ALT_BACKSLASH
-#define NANO_LASTLINE_ALTKEY2  NANO_ALT_PIPE
+#define NANO_LASTLINE_ALTKEY   NANO_ALT_SLASH
+#define NANO_LASTLINE_ALTKEY2  NANO_ALT_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_MISCKEY
+#define NANO_LASTFILE_ALTKEY2  NANO_LASTLINE_ALTKEY2
 #define NANO_REFRESH_KEY       NANO_CONTROL_L
 #define NANO_JUSTIFY_KEY       NANO_CONTROL_J
 #define NANO_JUSTIFY_FKEY      KEY_F(4)