# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1253288123 0
# Node ID 30c99a719e212f717fff8a0a0595ebd50968d86b
# Parent  ec0d4293e9919bf2220cf11c7330eba1f8b30d36
(dired-query-alist): Remove spurious backslash.
(dired-query): Use read-key.

diff -r ec0d4293e991 -r 30c99a719e21 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 18 15:34:23 2009 +0000
+++ b/lisp/ChangeLog	Fri Sep 18 15:35:23 2009 +0000
@@ -1,3 +1,8 @@
+2009-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* dired-aux.el (dired-query-alist): Remove spurious backslash.
+	(dired-query): Use read-key.
+
 2009-09-18  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* cus-start.el (ns-use-qd-smoothing): Remove.
diff -r ec0d4293e991 -r 30c99a719e21 lisp/dired-aux.el
--- a/lisp/dired-aux.el	Fri Sep 18 15:34:23 2009 +0000
+++ b/lisp/dired-aux.el	Fri Sep 18 15:35:23 2009 +0000
@@ -867,7 +867,7 @@
 	   failures)))))
 
 (defvar dired-query-alist
-  '((?\y . y) (?\040 . y)		; `y' or SPC means accept once
+  '((?y . y) (?\040 . y)		; `y' or SPC means accept once
     (?n . n) (?\177 . n)		; `n' or DEL skips once
     (?! . yes)				; `!' accepts rest
     (?q . no) (?\e . no)		; `q' or ESC skips rest
@@ -876,10 +876,10 @@
 
 ;;;###autoload
 (defun dired-query (qs-var qs-prompt &rest qs-args)
-  ;; Query user and return nil or t.
-  ;; Store answer in symbol VAR (which must initially be bound to nil).
-  ;; Format PROMPT with ARGS.
-  ;; Binding variable help-form will help the user who types the help key.
+  "Query user and return nil or t.
+Store answer in symbol VAR (which must initially be bound to nil).
+Format PROMPT with ARGS.
+Binding variable `help-form' will help the user who types the help key."
   (let* ((char (symbol-value qs-var))
 	 (action (cdr (assoc char dired-query-alist))))
     (cond ((eq 'yes action)
@@ -897,13 +897,12 @@
 	     ;; Actually it looks nicer without cursor-in-echo-area - you can
 	     ;; look at the dired buffer instead of at the prompt to decide.
 	     (apply 'message qprompt qs-args)
-	     (setq char (set qs-var (read-char)))
-	     (while (not (setq elt (assoc char dired-query-alist)))
-	       (message "Invalid char - type %c for help." help-char)
+	     (while (progn (setq char (set qs-var (read-key)))
+                           (not (setq elt (assoc char dired-query-alist))))
+	       (message "Invalid key - type %c for help." help-char)
 	       (ding)
 	       (sit-for 1)
-	       (apply 'message qprompt qs-args)
-	       (setq char (set qs-var (read-char))))
+	       (apply 'message qprompt qs-args))
 	     ;; Display the question with the answer.
 	     (message "%s" (concat (apply 'format qprompt qs-args)
 			      (char-to-string char)))