* simple.el (read-quoted-char): Don't let help chars pop up help

buffer.

Fixes: debbugs:16617

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90798ab722eb43499acd497d4daee70804bd77d8..51c7332a9a9590869001cb2e4b980eeddfb904a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-20  Leo Liu  <sdl.web@gmail.com>
+
+       * simple.el (read-quoted-char): Don't let help chars pop up help
+       buffer.  (Bug#16617)
+
 2014-06-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as

diff --git a/lisp/simple.el b/lisp/simple.el
index 4cc6e56aef81515d63a233aa125f0b91569c9f0c..d7f5b41830249b7b5c23ded5d9ce9210b12cbec0 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -658,11 +658,16 @@ any other terminator is used itself as input.
 The optional argument PROMPT specifies a string to use to prompt the user.
 The variable `read-quoted-char-radix' controls which radix to use
 for numeric input."
-  (let ((message-log-max nil) done (first t) (code 0) translated)
+  (let ((message-log-max nil)
+       (help-events (delq nil (mapcar (lambda (c) (unless (characterp c) c))
+                                      help-event-list)))
+       done (first t) (code 0) translated)
     (while (not done)
       (let ((inhibit-quit first)
-           ;; Don't let C-h get the help message--only help function keys.
+           ;; Don't let C-h or other help chars get the help
+           ;; message--only help function keys.  See bug#16617.
            (help-char nil)
+           (help-event-list help-events)
            (help-form
             "Type the special character you want to use,
 or the octal character code.