bug#16617: 24.3.50; REGRESSION: `C-q ?' pops up annoying *Char Help* buffer

[Leo Liu <sdl.web@gmail.com>]

On 2014-04-03 01:11 +0800, Drew Adams wrote:
> There has been no response to this regression report, which includes a clear recipe to repro it.
>
> This problem is still present as of this build:
>

Thanks for the report and sorry I missed it.

Stefan,

Can I fix it in emacs-24 along these lines? Thanks.   - Leo

=== modified file 'lisp/simple.el'
--- lisp/simple.el	2014-04-02 15:14:50 +0000
+++ lisp/simple.el	2014-04-03 13:31:12 +0000
@@ -658,11 +658,17 @@
 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.