ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert the Meta-P and Meta-N aliases for the paragraph searches for now; 

Meta-P was being interpreted as such even when it was used for the
Prepend toggle at the writeout prompt


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-03-15 20:03:01 +00:00
parent b6aa42864e
commit dc10ecbbd6
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -14,9 +14,6 @@ CVS code -
Also add NANO_FIRSTLINE_FKEY and NANO_LASTLINE_FKEY, and tweak Also add NANO_FIRSTLINE_FKEY and NANO_LASTLINE_FKEY, and tweak
the statusbar input routines to handle them and NANO_HELP_FKEY the statusbar input routines to handle them and NANO_HELP_FKEY
properly. (DLR) properly. (DLR)
- Add more intuitive Meta-key aliases for moving to the
beginning and ending lines of a paragraph at the search
prompt: Meta-P and Meta-N. (DLR)
- Block SIGWINCH after setting up its handler, and only unblock - Block SIGWINCH after setting up its handler, and only unblock
and handle it when we're in a stable state, i.e, when we're and handle it when we're in a stable state, i.e, when we're
waiting for input from the user. New function waiting for input from the user. New function

4
src/global.c
View File

@ -640,12 +640,12 @@ void shortcut_init(int unjustify)
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
/* Translators: try to keep this string under 10 characters long */ /* Translators: try to keep this string under 10 characters long */
sc_init_one(&whereis_list, NANO_PARABEGIN_KEY, _("Beg of Par"), sc_init_one(&whereis_list, NANO_PARABEGIN_KEY, _("Beg of Par"),
IFHELP(nano_parabegin_msg, NANO_PARABEGIN_ALTKEY), NANO_NO_KEY, IFHELP(nano_parabegin_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_para_begin); NANO_NO_KEY, VIEW, do_para_begin);
/* Translators: try to keep this string under 10 characters long */ /* Translators: try to keep this string under 10 characters long */
sc_init_one(&whereis_list, NANO_PARAEND_KEY, _("End of Par"), sc_init_one(&whereis_list, NANO_PARAEND_KEY, _("End of Par"),
IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY), NANO_NO_KEY, IFHELP(nano_paraend_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_para_end); NANO_NO_KEY, VIEW, do_para_end);
#endif #endif

2
src/nano.h
View File

@ -442,9 +442,7 @@ typedef struct historyheadtype {
#define NANO_NEXTWORD_KEY NANO_CONTROL_SPACE #define NANO_NEXTWORD_KEY NANO_CONTROL_SPACE
#define NANO_PREVWORD_KEY NANO_ALT_SPACE #define NANO_PREVWORD_KEY NANO_ALT_SPACE
#define NANO_PARABEGIN_KEY NANO_CONTROL_W #define NANO_PARABEGIN_KEY NANO_CONTROL_W
#define NANO_PARABEGIN_ALTKEY NANO_ALT_P
#define NANO_PARAEND_KEY NANO_CONTROL_O #define NANO_PARAEND_KEY NANO_CONTROL_O
#define NANO_PARAEND_ALTKEY NANO_ALT_N
#define NANO_VERBATIM_KEY NANO_ALT_V #define NANO_VERBATIM_KEY NANO_ALT_V
#ifndef NANO_SMALL #ifndef NANO_SMALL

2
src/winio.c
View File

@ -2056,12 +2056,10 @@ int statusq(int tabs, const shortcut *s, const char *def,
break; break;
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
case NANO_PARABEGIN_KEY: case NANO_PARABEGIN_KEY:
case NANO_PARABEGIN_ALTKEY:
do_para_begin(); do_para_begin();
resetstatuspos = 1; resetstatuspos = 1;
break; break;
case NANO_PARAEND_KEY: case NANO_PARAEND_KEY:
case NANO_PARAEND_ALTKEY:
do_para_end(); do_para_end();
resetstatuspos = 1; resetstatuspos = 1;
break; break;