From c91696e6df7cbcc2925bc68c32bbfd1194214902 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 29 Jan 2004 04:16:23 +0000 Subject: [PATCH] add function key alias for unjustify git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1639 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ src/global.c | 2 +- src/nano.c | 2 +- src/nano.h | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1ec136a..7b49c491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ CVS code - NANO_NEXTLINE_KEY, and the help messages for them have been changed accordingly. Also remove extraneous references to NANO_DOWN_KEY in the search history shortcut entries. (DLR) + - Add NANO_UNJUSTIFY_FKEY (the same as NANO_UNCUT_FKEY) to the + shortcut list, and tweak the unjustify routine to use it. + (DLR) - files.c: write_marked() - New function used to write the current marked selection to a diff --git a/src/global.c b/src/global.c index 91fdefd9..546a0be7 100644 --- a/src/global.c +++ b/src/global.c @@ -494,7 +494,7 @@ void shortcut_init(int unjustify) if (unjustify) /* Translators: try to keep this string under 10 characters long */ sc_init_one(&main_list, NANO_UNJUSTIFY_KEY, _("UnJustify"), - IFHELP(nano_unjustify_msg, NANO_NO_KEY), NANO_NO_KEY, + IFHELP(nano_unjustify_msg, NANO_NO_KEY), NANO_UNJUSTIFY_FKEY, NANO_NO_KEY, NOVIEW, do_uncut_text); else /* Translators: try to keep this string under 10 characters long */ diff --git a/src/nano.c b/src/nano.c index 19efdfe9..3f05df6e 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2663,7 +2663,7 @@ int do_para_operation(int operation) #endif } - if (i != NANO_UNJUSTIFY_KEY) { + if (i != NANO_UNJUSTIFY_KEY && i != NANO_UNJUSTIFY_FKEY) { ungetch(i); /* Did we back up anything at all? */ if (cutbuffer != cutbuffer_save) diff --git a/src/nano.h b/src/nano.h index 419d5bef..cf8645f3 100644 --- a/src/nano.h +++ b/src/nano.h @@ -404,7 +404,8 @@ typedef struct historyheadtype { #define NANO_REFRESH_KEY NANO_CONTROL_L #define NANO_JUSTIFY_KEY NANO_CONTROL_J #define NANO_JUSTIFY_FKEY KEY_F(4) -#define NANO_UNJUSTIFY_KEY NANO_CONTROL_U +#define NANO_UNJUSTIFY_KEY NANO_UNCUT_KEY /* Same key as uncut. */ +#define NANO_UNJUSTIFY_FKEY NANO_UNCUT_FKEY /* Same key as uncut. */ #define NANO_PREVLINE_KEY NANO_CONTROL_P #define NANO_NEXTLINE_KEY NANO_CONTROL_N #define NANO_FORWARD_KEY NANO_CONTROL_F -- 2.39.5