- 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
Этот коммит содержится в:
родитель
13fd44bfe4
Коммит
180a569fdb
@ -10,6 +10,9 @@ CVS code -
|
|||||||
- Typo fixes in help strings (Jordi).
|
- Typo fixes in help strings (Jordi).
|
||||||
- New variable helplen needes cause currslen is not always
|
- New variable helplen needes cause currslen is not always
|
||||||
the length we want (bug found by David Lawrence Ramsey).
|
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:
|
- files.c:
|
||||||
read_file()
|
read_file()
|
||||||
- Make conversion message less confusing (suggested by Jordi).
|
- Make conversion message less confusing (suggested by Jordi).
|
||||||
|
4
nano.c
4
nano.c
@ -2423,7 +2423,7 @@ void help_init(void)
|
|||||||
"support, and enable multiple buffers with the -F "
|
"support, and enable multiple buffers with the -F "
|
||||||
"or --multibuffer command line flags, the Meta-F toggle or "
|
"or --multibuffer command line flags, the Meta-F toggle or "
|
||||||
"using a nanorc file, inserting a file will cause it to be "
|
"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 "
|
"between file buffers).\n\n The following function keys are "
|
||||||
"available in Insert File mode:\n\n");
|
"available in Insert File mode:\n\n");
|
||||||
else if (currshortcut == writefile_list)
|
else if (currshortcut == writefile_list)
|
||||||
@ -3142,10 +3142,12 @@ int main(int argc, char *argv[])
|
|||||||
break;
|
break;
|
||||||
#ifdef ENABLE_MULTIBUFFER
|
#ifdef ENABLE_MULTIBUFFER
|
||||||
case NANO_OPENPREV_KEY:
|
case NANO_OPENPREV_KEY:
|
||||||
|
case NANO_OPENPREV_ALTKEY:
|
||||||
open_prevfile(0);
|
open_prevfile(0);
|
||||||
keyhandled = 1;
|
keyhandled = 1;
|
||||||
break;
|
break;
|
||||||
case NANO_OPENNEXT_KEY:
|
case NANO_OPENNEXT_KEY:
|
||||||
|
case NANO_OPENNEXT_ALTKEY:
|
||||||
open_nextfile(0);
|
open_nextfile(0);
|
||||||
keyhandled = 1;
|
keyhandled = 1;
|
||||||
break;
|
break;
|
||||||
|
8
nano.h
8
nano.h
@ -226,8 +226,10 @@ typedef struct colortype {
|
|||||||
#define NANO_ALT_X 'x'
|
#define NANO_ALT_X 'x'
|
||||||
#define NANO_ALT_Y 'y'
|
#define NANO_ALT_Y 'y'
|
||||||
#define NANO_ALT_Z 'z'
|
#define NANO_ALT_Z 'z'
|
||||||
#define NANO_ALT_LCARAT ','
|
#define NANO_ALT_PERIOD ','
|
||||||
#define NANO_ALT_RCARAT '.'
|
#define NANO_ALT_COMMA '.'
|
||||||
|
#define NANO_ALT_LCARAT '<'
|
||||||
|
#define NANO_ALT_RCARAT '>'
|
||||||
#define NANO_ALT_BRACKET ']'
|
#define NANO_ALT_BRACKET ']'
|
||||||
|
|
||||||
/* Some semi-changeable keybindings; don't play with unless you're sure you
|
/* 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_APPEND_KEY NANO_ALT_A
|
||||||
#define NANO_OPENPREV_KEY NANO_ALT_LCARAT
|
#define NANO_OPENPREV_KEY NANO_ALT_LCARAT
|
||||||
#define NANO_OPENNEXT_KEY NANO_ALT_RCARAT
|
#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 NANO_BRACKET_KEY NANO_ALT_BRACKET
|
||||||
|
|
||||||
#define TOGGLE_CONST_KEY NANO_ALT_C
|
#define TOGGLE_CONST_KEY NANO_ALT_C
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user