summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2014-06-20 08:14:43 +0800
committerLeo Liu <sdl.web@gmail.com>2014-06-20 08:14:43 +0800
commit2c25d5e6216d556a85f9c01bba5671f41637e11f (patch)
tree862dde4019d111a0509a9441ee60404112fc0e4d
parente9638b49e53127fe410fbc3689c1d781c61e09b7 (diff)
downloademacs-2c25d5e6216d556a85f9c01bba5671f41637e11f.tar.gz
* simple.el (read-quoted-char): Don't let help chars pop up help
buffer. Fixes: debbugs:16617
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el9
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90798ab722e..51c7332a9a9 100644
--- 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 4cc6e56aef8..d7f5b418302 100644
--- 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.