From: Chris Allegretta <chrisa@asty.org>
Date: Wed, 2 Jan 2002 14:30:33 +0000 (+0000)
Subject: - nano.c:help_init() - Typo in file switch string (found by David Lawrence Ramsey... 
X-Git-Tag: v1.1.5~17
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=180a569fdb783c5d8fccfa72488220b3e98a0cfd;p=nano.git

- nano.c:help_init() - Typo in file switch string (found by David Lawrence Ramsey). main() - Handle Alt prev/next file keys (,.), as well as normal ones (<>).


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

diff --git a/ChangeLog b/ChangeLog
index b2c2a078..77abf4fe 100644
--- 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 9f823d07..8045bf27 100644
--- 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 1a08e521..7b4bb2a5 100644
--- 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