From: hmurata <hmurata>
Date: Tue, 31 Jan 2006 12:38:51 +0000 (+0000)
Subject: * wl-util.el (wl-y-or-n-p-with-scroll): Use `wl-read-event-char'
X-Git-Tag: wl-2_15_3~13
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2edeaa4a8acb23072f356d1c9076fbf48f0e0d42;p=elisp%2Fwanderlust.git

* wl-util.el (wl-y-or-n-p-with-scroll): Use `wl-read-event-char'
instead of `read-event'.

* wl-xmas.el (wl-read-event-char): Add optional argument `prompt'.

* wl-mule.el (wl-read-event-char): Ditto.

* wl-e21.el (wl-read-event-char): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 4668bce..85a502e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-31  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-util.el (wl-y-or-n-p-with-scroll): Use `wl-read-event-char'
+	instead of `read-event'.
+
+	* wl-xmas.el (wl-read-event-char): Add optional argument `prompt'.
+
+	* wl-mule.el (wl-read-event-char): Ditto.
+
+	* wl-e21.el (wl-read-event-char): Ditto.
+
 2006-01-30  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-vars.el (wl-draft-send-confirm-type): Change default value.
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 45cd54e..c385827 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -672,9 +672,9 @@ Special commands:
 
 (defalias 'wl-defface 'defface)
 
-(defun wl-read-event-char ()
+(defun wl-read-event-char (&optional prompt)
   "Get the next event."
-  (let ((event (read-event)))
+  (let ((event (read-event prompt)))
     (cons (and (numberp event) event) event)))
 
 (put 'wl-modeline-biff-state-on 'risky-local-variable t)
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 54b55da..c37c710 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -303,9 +303,9 @@ Warning: Unknown req `%S' with options `%S'" req options)
 			     nil))))
 	match)))))
 
-(defun wl-read-event-char ()
+(defun wl-read-event-char (&optional prompt)
   "Get the next event."
-  (let ((event (read-event)))
+  (let ((event (read-event prompt)))
     (cons (and (numberp event) event) event)))
 
 (require 'product)
diff --git a/wl/wl-util.el b/wl/wl-util.el
index d543210..2f2ec54 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -1107,10 +1107,10 @@ is enclosed by at least one regexp grouping construct."
       (while t
 	(discard-input)
 	(case (let ((cursor-in-echo-area t))
-		(read-event prompt))
+		(cdr (wl-read-event-char prompt)))
 	  ((?y ?Y)
 	   (throw 'done t))
-	  (? 
+	  (?\ 
 	   (if scroll-by-SPC
 	       (ignore-errors (scroll-up))
 	     (throw 'done t)))
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index c130ea1..baa55e2 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -554,9 +554,9 @@ Special commands:
 
 (defalias 'wl-defface 'defface)
 
-(defun wl-read-event-char ()
+(defun wl-read-event-char (&optional prompt)
   "Get the next event."
-  (let ((event (next-command-event)))
+  (let ((event (next-command-event nil prompt)))
     (sit-for 0)
     ;; We junk all non-key events.  Is this naughty?
     (while (not (or (key-press-event-p event)