Make what-key function available in pager-based menus, too

diff --git a/UPDATING b/UPDATING
index 583ff615ff0936e1f77169e1c6b403e0fbd6c6ec..3a1fc8170682cce1be61e3a4f06ad8ef663030e8 100644 (file)
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,7 @@ The keys used are:
 
 hg tip:
 
+  + <what-key> function works in pager, too
   + support for tokyocabinet (qdbm successor)
   ! $move now defaults to "no" instead of "ask-no"
   + $imap_pipeline_depth controls the number of commands that mutt can issue

diff --git a/functions.h b/functions.h
index fb52018f38be902d82bacb022738b368e640e1a9..b34c566712670886e9e13285d113196cd829185c 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -264,6 +264,7 @@ struct binding_t OpPager[] = { /* map: pager */
   { "decrypt-copy",    OP_DECRYPT_COPY,                NULL },
   { "decrypt-save",            OP_DECRYPT_SAVE,                NULL },
 
+  { "what-key",                OP_WHAT_KEY,            NULL },
 
   { NULL,              0,                              NULL }
 };

diff --git a/keymap.c b/keymap.c
index dbdde0875750f46eb972381ab07d732b09c62af1..bcc00226c9a65a6248f3d164a8ca0993100d7781 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -1000,4 +1000,5 @@ void mutt_what_key (void)
   while (ch != ERR && ch != ctrl ('G'));
 
   mutt_flushinp();
+  mutt_clear_error();
 }

diff --git a/pager.c b/pager.c
index e680a2516cc9f52cfb314b0c965b9a76fa5c772f..74238baaf154d9f582474c80175b55cded1fdc0b 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2671,6 +2671,10 @@ search_next:
         redraw = REDRAW_FULL;
         break;
 
+      case OP_WHAT_KEY:
+       mutt_what_key ();
+       break;
+
       default:
        ch = -1;
        break;