in do_browser() and do_help(), don't treat NANO_CANCEL_KEY as
NANO_EXIT_KEY anymore, for consistency
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2478 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
diff --git a/src/winio.c b/src/winio.c
index b818f5a..f07d6d7 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3907,11 +3907,6 @@
}
break;
#endif
- case NANO_NEXTPAGE_KEY:
- case NANO_NEXTPAGE_FKEY:
- if (!no_more)
- line += editwinrows - 2;
- break;
case NANO_PREVPAGE_KEY:
case NANO_PREVPAGE_FKEY:
if (line > 0) {
@@ -3920,6 +3915,11 @@
line = 0;
}
break;
+ case NANO_NEXTPAGE_KEY:
+ case NANO_NEXTPAGE_FKEY:
+ if (!no_more)
+ line += editwinrows - 2;
+ break;
case NANO_PREVLINE_KEY:
if (line > 0)
line--;
@@ -3959,8 +3959,7 @@
skip_redisplay:
kbinput = get_kbinput(edit, &meta_key, &func_key);
- } while (kbinput != NANO_CANCEL_KEY && kbinput != NANO_EXIT_KEY &&
- kbinput != NANO_EXIT_FKEY);
+ } while (kbinput != NANO_EXIT_KEY && kbinput != NANO_EXIT_FKEY);
#ifndef DISABLE_MOUSE
currshortcut = oldshortcut;