Making the Minus and Space keys work in the help viewer and file browser

also when the PrevPage and NextPage functions are bound to meta keys.

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

diff --git a/ChangeLog b/ChangeLog
index 43322a4d6f484948e0f4e299151889de7970a093..471148f5e66cddf4173563475f21816aac23e724 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2014-04-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c, src/help.c, src/text.c, src/browser.c: Remove
         several unneeded double semicolons, and two relic comments.
+       * src/help.c (parse_help_input), src/browser.c (parse_browser_input):
+       Make the Minus and Space keys work in the help viewer and file browser
+       also when the PrevPage and NextPage functions are bound to meta-key
+       sequences -- searching for these will not find them.  So, instead put
+       in the standard key code.  This fixes Savannah bug #42140.
 
 2014-04-22  Benno Schulenberg  <bensberg@justemail.net>
        * src/global.c (shortcut_init): Put the movement keys in the

diff --git a/src/browser.c b/src/browser.c
index cdad8d5e303ecfd3814e16a6672ecb15ffda1603..1025d31018c3f43a4ae769d0bac7152b083dd288 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -551,10 +551,10 @@ void parse_browser_input(int *kbinput, bool *meta_key)
     if (!*meta_key) {
        switch (*kbinput) {
            case ' ':
-               *kbinput = sc_seq_or(do_page_down, 0);
+               *kbinput = KEY_NPAGE;
                break;
            case '-':
-               *kbinput = sc_seq_or(do_page_up, 0);
+               *kbinput = KEY_PPAGE;
                break;
            case '?':
 #ifndef DISABLE_HELP

diff --git a/src/help.c b/src/help.c
index 6b7ecd614a683d3998cd5b8403d5bdbc2a278cbc..1ecf0ddb0b7e9dc858274d0863e6b94784a382d6 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -494,10 +494,10 @@ void parse_help_input(int *kbinput, bool *meta_key)
        switch (*kbinput) {
            /* For consistency with the file browser. */
            case ' ':
-               *kbinput = sc_seq_or(do_page_down, 0);
+               *kbinput = KEY_NPAGE;
                break;
            case '-':
-               *kbinput = sc_seq_or(do_page_up, 0);
+               *kbinput = KEY_PPAGE;
                break;
            case 'E':
            case 'e':