nano

commit bbabf9562a39f46887118f45ced7c28dd3af8953
parent 4218206fecac440a7c2af46b523e342ff0624fcd
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Thu, 11 May 2006 00:58:26 +0000

fix bracket matching breakage in do_statusbar_input() since its shortcut
was changed to Ctrl-]


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

Diffstat:
M
ChangeLog
 | 
3
++-
M
src/prompt.c
 | 
15
+++++----------

2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -66,6 +66,8 @@ CVS code -
 	  do_indent_marked(), do_indent_marked_void(), and
 	  do_unindent_marked_void(); changes to shortcut_init(). (Chris
 	  and DLR)
+	- Change the shortcut to find the matching bracket to ^].
+	  Changes to shortcut_init() and do_statusbar_input(). (DLR)
 	- Add the ability to move to the first and last line of the help
 	  text and the first and last file in the file browser via
 	  Meta-\ (Meta-|) and Meta-/ (Meta-?).  Changes to do_browser(),
@@ -127,7 +129,6 @@ CVS code -
 	  (DLR and Benno Schulenberg, suggested by Benno Schulenberg)
 	- Tweak the descriptions of some shortcut keys to make them more
 	  uniform. (Benno Schulenberg, minor tweaks by DLR)
-	- Change the shortcut to find the matching bracket to ^]. (DLR)
 	- Shorten the "Where is Next" shortcut name to fit on the screen
 	  after adding Meta-\ (Meta-|) and Meta-/ (Meta-?). (DLR)
 	- Lengthen the "UnCut Txt" shortcut name to "UnCut Text", as
diff --git a/src/prompt.c b/src/prompt.c
@@ -89,17 +89,13 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
 	input == NANO_BACKSPACE_KEY || input == NANO_DELETE_KEY ||
 	input == NANO_CUT_KEY ||
 #ifndef NANO_TINY
-		input == NANO_NEXTWORD_KEY ||
+	input == NANO_NEXTWORD_KEY || input == NANO_BRACKET_KEY ||
 #endif
-		(*meta_key == TRUE && (
+	(*meta_key == TRUE && (
 #ifndef NANO_TINY
-		input == NANO_PREVWORD_KEY ||
+	input == NANO_PREVWORD_KEY ||
 #endif
-		input == NANO_VERBATIM_KEY
-#ifndef NANO_TINY
-		|| input == NANO_BRACKET_KEY
-#endif
-		)));
+	input == NANO_VERBATIM_KEY)));
 
     /* Set s_or_t to TRUE if we got a shortcut. */
     *s_or_t = have_shortcut;
@@ -184,8 +180,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
 		    break;
 #ifndef NANO_TINY
 		case NANO_BRACKET_KEY:
-		    if (*meta_key == TRUE)
-			do_statusbar_find_bracket();
+		    do_statusbar_find_bracket();
 		    break;
 #endif
 		case NANO_VERBATIM_KEY: