* lisp/dired-aux.el (dired-query): Don't assume help-char is modifier-free.

Fixes: debbugs:10191

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc32133f3f8..c14312209b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired-aux.el (dired-query): Don't assume help-char is modifier-free
+        (bug#10191).
+
 2011-12-02  Juri Linkov  <juri@jurta.org>
 
         * info.el (Info-search): Display "end of manual" when Isearch
@@ -194,8 +199,8 @@
         (gdb-gud-context-command, gdb-non-stop-handler)
         (gdb-current-context-command, gdb-stopped): Use it.
         (gdb-init-1): Enable pretty printing here.
-        (gdb-non-stop-handler): Don't enable pretty-printing here.  Check
-        to see if the target supports non-stop mode; if not, turn off
+        (gdb-non-stop-handler): Don't enable pretty-printing here.
+        Check to see if the target supports non-stop mode; if not, turn off
         non-stop mode.  Use the following.
         (gdb-check-target-async): New defun.
         (gud-watch, gdb-stopped): Fix whitespace.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b63940cec2d..757e814dba1 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -927,8 +927,7 @@ return t; if SYM is q or ESC, return nil."
                  (concat (apply 'format prompt args)
                          (if help-form
                              (format " [Type yn!q or %s] "
-                                     (key-description
-                                      (char-to-string help-char)))
+                                     (key-description (vector help-char)))
                            " [Type y, n, q or !] ")))
            (set sym (setq char (read-char-choice prompt char-choices)))
            (if (memq char '(?y ?\s ?!)) t)))))