[Emacs-diffs] /srv/bzr/emacs/trunk r106579: * lisp/dired-aux.el (dired-query): Don't assume help-char is modifier-free.

[Stefan Monnier]

------------------------------------------------------------
revno: 106579
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10191
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-02 09:18:18 -0500
message:
  * lisp/dired-aux.el (dired-query): Don't assume help-char is modifier-free.
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-02 10:45:44 +0000
+++ b/lisp/ChangeLog    2011-12-02 14:18:18 +0000
@@ -1,3 +1,8 @@
+2011-12-02  Stefan Monnier  <address@hidden>
+
+       * dired-aux.el (dired-query): Don't assume help-char is modifier-free
+       (bug#10191).
+
 2011-12-02  Juri Linkov  <address@hidden>
 
        * 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.

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2011-11-17 09:09:20 +0000
+++ b/lisp/dired-aux.el 2011-12-02 14:18:18 +0000
@@ -927,8 +927,7 @@
                 (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)))))