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

consistency fix: the convention for shortcuts lists other than the main 

list is apparently to only allow meta shortcuts as toggles, so only
allow the meta shortcuts for searching for the beginning and end of the
paragraph and justifying the entire file to go in the main list


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1949 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-09-28 16:51:08 +00:00
parent 670a56c241
commit 9bab9ff5b4
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -39,11 +39,11 @@ CVS code -
edit_update(), rename open_the_file() to open_file() since the edit_update(), rename open_the_file() to open_file() since the
latter has been removed, and rename load_a_file() to latter has been removed, and rename load_a_file() to
load_buffer(). load_buffer().
- Add alternative shortcuts for moving to the beginning and end - Add alternative shortcuts to the main list for moving to the
of a paragraph and justifying the entire file: Meta-( beginning and end of a paragraph and justifying the entire
(Meta-9), Meta-) (Meta-0), and Meta-J, respectively. Also add file: Meta-( (Meta-9), Meta-) (Meta-0), and Meta-J,
these functions to the main shortcut list, as Pico's practice respectively. Do this because Pico's practice of putting these
of putting them in the search menu is rather odd. (DLR) shortcuts in the search menu is rather odd. (DLR)
- Turn off extended input processing (the IEXTEN termios flag) - Turn off extended input processing (the IEXTEN termios flag)
as nano 1.2.x does. New function disable_extended_input(); as nano 1.2.x does. New function disable_extended_input();
changes to terminal_init(). (DLR) changes to terminal_init(). (DLR)

10
src/global.c
View File

@ -624,17 +624,17 @@ 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_msg, sc_init_one(&whereis_list, NANO_PARABEGIN_KEY, beg_of_par_msg,
IFHELP(nano_parabegin_msg, NANO_PARABEGIN_ALTKEY1), NANO_NO_KEY, IFHELP(nano_parabegin_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_PARABEGIN_ALTKEY2, 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_msg, sc_init_one(&whereis_list, NANO_PARAEND_KEY, end_of_par_msg,
IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY1), NANO_NO_KEY, IFHELP(nano_paraend_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_PARAEND_ALTKEY2, VIEW, do_para_end); NANO_NO_KEY, VIEW, do_para_end);
/* 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_FULLJUSTIFY_KEY, fulljstify_msg, sc_init_one(&whereis_list, NANO_FULLJUSTIFY_KEY, fulljstify_msg,
IFHELP(nano_fulljustify_msg, NANO_FULLJUSTIFY_ALTKEY), NANO_NO_KEY, IFHELP(nano_fulljustify_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, NOVIEW, do_full_justify); NANO_NO_KEY, NOVIEW, do_full_justify);
#endif #endif

5
src/winio.c
View File

@ -3026,19 +3026,14 @@ int statusq(int allowtabs, 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_ALTKEY1:
case NANO_PARABEGIN_ALTKEY2:
do_para_begin(); do_para_begin();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_PARAEND_KEY: case NANO_PARAEND_KEY:
case NANO_PARAEND_ALTKEY1:
case NANO_PARAEND_ALTKEY2:
do_para_end(); do_para_end();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_FULLJUSTIFY_KEY: case NANO_FULLJUSTIFY_KEY:
case NANO_FULLJUSTIFY_ALTKEY:
if (!ISSET(VIEW_MODE)) if (!ISSET(VIEW_MODE))
do_full_justify(); do_full_justify();
resetstatuspos = TRUE; resetstatuspos = TRUE;