nano

commit 623b1b6b0bf776ddcd6553d27130139413699895
parent fdec2a1d2d298bedfe251efd825a12223a7b7edc
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Tue, 15 Apr 2014 19:32:45 +0000

Removing superfluous abortion variable.


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

Diffstat:
M
ChangeLog
 | 
1
+
M
src/help.c
 | 
9
+++------

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -10,6 +10,7 @@
 	shortcuts M-\ and M-/ for First Line and Last Line to the help
 	viewer, instead of ^Y and ^V, which are already taken for Page
 	Up and Page Down.  Also, stop them from aborting the viewer.
+	* src/help.c (do_help): Remove superfluous abortion variable.
 
 2014-04-14  Benno Schulenberg  <bensberg@justemail.net>
 	* src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter
diff --git a/src/help.c b/src/help.c
@@ -38,8 +38,6 @@ void do_help(void (*refresh_func)(void))
 {
     int kbinput = ERR;
     bool meta_key, func_key, old_no_help = ISSET(NO_HELP);
-    bool abort = FALSE;
-	/* Whether we should abort the help browser. */
     size_t line = 0;
 	/* The line number in help_text of the first displayed help
 	 * line.  This variable is zero-based. */
@@ -94,7 +92,7 @@ void do_help(void (*refresh_func)(void))
     if (last_line > 0)
 	last_line--;
 
-    while (!abort) {
+    while (TRUE) {
 	size_t i;
 
 	/* Display the help text if we don't have a key, or if the help
@@ -169,10 +167,9 @@ void do_help(void (*refresh_func)(void))
 		    if (line + (editwinrows - 1) < last_line)
 			line = last_line - (editwinrows - 1);
 		}
-	    /* Abort the help browser. */
 	} else if (f->scfunc == do_exit) {
-		abort = TRUE;
-		break;
+	    /* Abort the help browser. */
+	    break;
 	}
     }