- nano.c:help_init() - Typo in file switch string (found by David Lawrence Ramsey...

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

diff --git a/ChangeLog b/ChangeLog
index b2c2a078d82d7b42532a3f14ead62e5748cee9bf..77abf4fe201dbd6ae99fcd50d69de35c659c585b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ CVS code -
        - Typo fixes in help strings (Jordi).
        - New variable helplen needes cause currslen is not always
          the length we want (bug found by David Lawrence Ramsey).
+       - Typo in file switch string (found by David Lawrence Ramsey).
+  main()
+       - Handle Alt prev/next file keys (,.), as well as normal ones (<>).
 - files.c:
   read_file()
        - Make conversion message less confusing (suggested by Jordi).

diff --git a/nano.c b/nano.c
index 9f823d072bf50ae699e761376aef4035f5d1ecc0..8045bf27e3989b72529c1f1353744d00c4ab98f0 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -2423,7 +2423,7 @@ void help_init(void)
                "support, and enable multiple buffers with the -F "
                "or --multibuffer command line flags, the Meta-F toggle or "
                "using a nanorc file, inserting a file will cause it to be "
-               "loaded into a separate buffer (use Ctrl-< and > to switch "
+               "loaded into a separate buffer (use Meta-< and > to switch "
                "between file buffers).\n\n The following function keys are "
                "available in Insert File mode:\n\n");
     else if (currshortcut == writefile_list)
@@ -3142,10 +3142,12 @@ int main(int argc, char *argv[])
                break;
 #ifdef ENABLE_MULTIBUFFER
            case NANO_OPENPREV_KEY:
+           case NANO_OPENPREV_ALTKEY:
                open_prevfile(0);
                keyhandled = 1;
                break;
            case NANO_OPENNEXT_KEY:
+           case NANO_OPENNEXT_ALTKEY:
                open_nextfile(0);
                keyhandled = 1;
                break;

diff --git a/nano.h b/nano.h
index 1a08e5215ee9ffed9d240467903bc762ef9c0db3..7b4bb2a5058187774e9a6daa1416991f97c0def1 100644 (file)
--- a/nano.h
+++ b/nano.h
@@ -226,8 +226,10 @@ typedef struct colortype {
 #define NANO_ALT_X 'x'
 #define NANO_ALT_Y 'y'
 #define NANO_ALT_Z 'z'
-#define NANO_ALT_LCARAT ','
-#define NANO_ALT_RCARAT '.'
+#define NANO_ALT_PERIOD ','
+#define NANO_ALT_COMMA '.'
+#define NANO_ALT_LCARAT '<'
+#define NANO_ALT_RCARAT '>'
 #define NANO_ALT_BRACKET ']'
 
 /* Some semi-changeable keybindings; don't play with unless you're sure you
@@ -286,6 +288,8 @@ know what you're doing */
 #define NANO_APPEND_KEY                NANO_ALT_A
 #define NANO_OPENPREV_KEY      NANO_ALT_LCARAT
 #define NANO_OPENNEXT_KEY      NANO_ALT_RCARAT
+#define NANO_OPENPREV_ALTKEY   NANO_ALT_COMMA
+#define NANO_OPENNEXT_ALTKEY   NANO_ALT_PERIOD
 #define NANO_BRACKET_KEY       NANO_ALT_BRACKET
 
 #define TOGGLE_CONST_KEY       NANO_ALT_C