master ed2450e79b5: Prevent echo area help message from being printed repeatedly

[Po Lu]

branch: master
commit ed2450e79b597e0306f14b542e934a90dfd9786f
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Prevent echo area help message from being printed repeatedly
    
    * src/keyboard.c (echo_dash): Detect echo_keystrokes_help
    messages and return if they be present.
---
 src/keyboard.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index cd6ccbd77d0..78ea1893ba1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -580,7 +580,10 @@ echo_dash (void)
       idx = make_fixnum (SCHARS (KVAR (current_kboard, echo_string)) - 1);
       last_char = Faref (KVAR (current_kboard, echo_string), idx);
 
-      if (XFIXNUM (last_char) == '-' && XFIXNUM (prev_char) != ' ')
+      if ((XFIXNUM (last_char) == '-' && XFIXNUM (prev_char) != ' ')
+         /* Or a keystroke help message.  */
+         || (echo_keystrokes_help
+             && XFIXNUM (last_char) == ')' && XFIXNUM (prev_char) == 'p'))
        return;
     }