nano

commit d29e861376e5b0fc717386009a5187458371b43d
parent 8992d0adaaacc3722c4eb0bc0e6eb3b64982be0f
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Wed, 10 May 2006 13:06:58 +0000

in do_(statusbar_)?input(), remove redundant check for allow_funcs'
being TRUE when we get KEY_MOUSE


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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
src/nano.c
 | 
2
+-
M
src/prompt.c
 | 
2
+-

3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -157,6 +157,9 @@ CVS code -
 	- Fix inaccuracies in the usage example. (DLR)
   renumber()
 	- Remove invalid assert. (DLR, found by Filipe Moreira)
+  do_input()
+	- Remove redundant check for allow_funcs' being TRUE when we get
+	  KEY_MOUSE. (DLR)
 - nano.h:
 	- Reorder the toggle #defines to match their corresponding order
 	  in toggle_init(). (DLR)
@@ -166,6 +169,9 @@ CVS code -
 	  disabled, so that we aren't erroneously kicked out of the
 	  statusbar prompt under any circumstances. (DLR, found by Benno
 	  Schulenberg)
+  do_statusbar_input()
+	- Remove redundant check for allow_funcs' being TRUE when we get
+	  KEY_MOUSE. (DLR)
   do_yesno()
 	- Handle the keys in a switch statement instead of a long if
 	  block, for simplicity. (DLR)
diff --git a/src/nano.c b/src/nano.c
@@ -1284,7 +1284,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
     if (allow_funcs) {
 	/* If we got a mouse click and it was on a shortcut, read in the
 	 * shortcut character. */
-	if (allow_funcs && *func_key == TRUE && input == KEY_MOUSE)
+	if (*func_key == TRUE && input == KEY_MOUSE)
 	    input = do_mouse() ? get_kbinput(edit, meta_key, func_key) :
 		ERR;
     }
diff --git a/src/prompt.c b/src/prompt.c
@@ -72,7 +72,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
     if (allow_funcs) {
 	/* If we got a mouse click and it was on a shortcut, read in the
 	 * shortcut character. */
-	if (allow_funcs && *func_key == TRUE && input == KEY_MOUSE)
+	if (*func_key == TRUE && input == KEY_MOUSE)
 	    input = do_statusbar_mouse() ? get_kbinput(bottomwin,
 		meta_key, func_key) : ERR;
     }