Removing superfluous abortion variable.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4779 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-04-15 19:32:45 +00:00
parent fdec2a1d2d
commit 623b1b6b0b
2 changed files with 4 additions and 6 deletions

View File

@ -10,6 +10,7 @@
shortcuts M-\ and M-/ for First Line and Last Line to the help 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 viewer, instead of ^Y and ^V, which are already taken for Page
Up and Page Down. Also, stop them from aborting the viewer. 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> 2014-04-14 Benno Schulenberg <bensberg@justemail.net>
* src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter * src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter

View File

@ -38,8 +38,6 @@ void do_help(void (*refresh_func)(void))
{ {
int kbinput = ERR; int kbinput = ERR;
bool meta_key, func_key, old_no_help = ISSET(NO_HELP); 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; size_t line = 0;
/* The line number in help_text of the first displayed help /* The line number in help_text of the first displayed help
* line. This variable is zero-based. */ * line. This variable is zero-based. */
@ -94,7 +92,7 @@ void do_help(void (*refresh_func)(void))
if (last_line > 0) if (last_line > 0)
last_line--; last_line--;
while (!abort) { while (TRUE) {
size_t i; size_t i;
/* Display the help text if we don't have a key, or if the help /* Display the help text if we don't have a key, or if the help
@ -169,9 +167,8 @@ void do_help(void (*refresh_func)(void))
if (line + (editwinrows - 1) < last_line) if (line + (editwinrows - 1) < last_line)
line = last_line - (editwinrows - 1); line = last_line - (editwinrows - 1);
} }
/* Abort the help browser. */
} else if (f->scfunc == do_exit) { } else if (f->scfunc == do_exit) {
abort = TRUE; /* Abort the help browser. */
break; break;
} }
} }