(map-y-or-n-p): Accept non-char events.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61a8b8f553d2dad14a1c63bb37206fe3c253682b..c08414554680ee853e494070e7b9214adae09812 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,11 @@
+2008-06-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/map-ynp.el (map-y-or-n-p): Accept non-char events.
+
 2008-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
-       * longlines.el (longlines-search-forward)
-       (longlines-search-backward, longlines-re-search-forward): Use a
-       smarter search-spaces-regexp.
+       * longlines.el (longlines-search-forward, longlines-search-backward)
+       (longlines-re-search-forward): Use a smarter search-spaces-regexp.
 
 2008-06-12  Sam Steingold  <sds@gnu.org>
 
@@ -11,8 +14,7 @@
 
 2008-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
-       * menu-bar.el (menu-set-font): Renamed x-font-dialog to
-       x-select-font.
+       * menu-bar.el (menu-set-font): Rename x-font-dialog to x-select-font.
 
 2008-06-12  Glenn Morris  <rgm@gnu.org>
 
@@ -21,8 +23,8 @@
 
        * term/mac-win.el (x-toolkit-scroll-bars): Check bound.
 
-       * progmodes/cperl-mode.el (cperl-info-on-command): Use
-       display-pixel-height rather than x-display-pixel-height.
+       * progmodes/cperl-mode.el (cperl-info-on-command):
+       Use display-pixel-height rather than x-display-pixel-height.
 
        * mail/rmailedit.el (rmail-cease-edit):
        * vc-dispatcher.el (vc-dir-mode): Check tool-bar-mode is bound.

diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 0820c5c1e4d6adcfc18c525c172c4c3a4676bb06..ec173d1197b2e44fc34a8ced001275d976f94a5f 100644 (file)
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -112,10 +112,9 @@ Returns the number of actions taken."
                use-menus t
                mouse-event last-nonmenu-event))
       (setq user-keys (if action-alist
-                         (concat (mapconcat (function
-                                             (lambda (elt)
-                                               (key-description
-                                                (char-to-string (car elt)))))
+                         (concat (mapconcat (lambda (elt)
+                                               (key-description
+                                                (vector (car elt))))
                                             action-alist ", ")
                                  " ")
                        "")