* wl-xmas.el (wl-read-event-char): Move from wl-util.el.

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

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

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

* wl-util.el (toplevel): Removed dummy definition of `read-event'.
(wl-read-event-char, wl-xmas-read-event-char): Removed.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5d0c5d1..a74d4b0 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,17 @@
+2001-01-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-xmas.el (wl-read-event-char): Move from wl-util.el.
+
+       * wl-mule.el (wl-read-event-char): Ditto.
+
+       * wl-e21.el (wl-read-event-char): Ditto.
+
+       * wl-nemacs.el (wl-read-event-char): Ditto.
+       (read-event): Removed.
+
+       * wl-util.el (toplevel): Comment out definition of `read-event'.
+       (wl-read-event-char, wl-xmas-read-event-char): Removed.
+
 2001-01-10  Katsumi Yamaoka    <yamaoka@jpl.org>
 
        * wl-nemacs.el (elmo-archive-call-process): Moved to

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index a493abb..1c99c8e 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -603,6 +603,11 @@ Special commands:
 
 (defalias 'wl-defface 'defface)
 
+(defun wl-read-event-char ()
+  "Get the next event."
+  (let ((event (read-event)))
+    (cons (and (numberp event) event) event)))
+
 (require 'product)
 (product-provide (provide 'wl-e21) (require 'wl-version))
 

diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 76538e6..ad63c74 100644 (file)
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -279,6 +279,11 @@ Warning: Unknown req `%S' with options `%S'" req options))
                             nil))))
        match)))))
 
+(defun wl-read-event-char ()
+  "Get the next event."
+  (let ((event (read-event)))
+    (cons (and (numberp event) event) event)))
+
 (require 'product)
 (product-provide (provide 'wl-mule) (require 'wl-version))
 

diff --git a/wl/wl-nemacs.el b/wl/wl-nemacs.el
index 7087f33..112f46b 100644 (file)
--- a/wl/wl-nemacs.el
+++ b/wl/wl-nemacs.el
@@ -123,14 +123,13 @@ However, if `mail-yank-prefix' is non-nil, insert that prefix on each line."
                                  (forward-char -1)
                                  (point))))))))
 
-(defun-maybe find-file-name-handler (filename operation))
+(defun wl-read-event-char ()
+  "Get the next event."
+  ;; Nemacs does not have read-char-exclusive().
+  (let ((event (read-char)))
+    (cons (and (numberp event) event) event)))
 
-(defun-maybe read-event ()
-  (setq unread-command-events
-       (if (fboundp 'read-char-exclusive)
-           (read-char-exclusive)
-         ;; XXX Emacs18.59 does not have read-char-exclusive().
-         (read-char))))
+(defun-maybe find-file-name-handler (filename operation))
 
 (defmacro easy-menu-define (a b c d)
   (` (defvar (, a) nil (, c))))

diff --git a/wl/wl-util.el b/wl/wl-util.el
index 7e33be3..6ad81f5 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -41,7 +41,6 @@
 
 (eval-when-compile
   (require 'time-stamp)
-  (defalias-maybe 'read-event 'ignore)
   (defalias-maybe 'next-command-event 'ignore)
   (defalias-maybe 'event-to-character 'ignore)
   (defalias-maybe 'key-press-event-p 'ignore)
@@ -149,28 +148,6 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses,
       (append list (list element))
     list))
 
-(defun wl-read-event-char ()
-  "Get the next event."
-  (let ((event (read-event)))
-    ;; should be gnus-characterp, but this can't be called in XEmacs anyway
-    (cons (and (numberp event) event) event)))
-
-(defun wl-xmas-read-event-char ()
-  "Get the next event."
-  (let ((event (next-command-event)))
-    (sit-for 0)
-    ;; We junk all non-key events.  Is this naughty?
-    (while (not (or (key-press-event-p event)
-                   (button-press-event-p event)))
-      (dispatch-event event)
-      (setq event (next-command-event)))
-    (cons (and (key-press-event-p event)
-              (event-to-character event))
-         event)))
-
-(if wl-on-xemacs
-    (fset 'wl-read-event-char 'wl-xmas-read-event-char))
-
 (defmacro wl-push (v l)
   "Insert V at the head of the list stored in L."
   (list 'setq l (list 'cons v l)))

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index d301722..8e95570 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -518,6 +518,19 @@ Special commands:
 
 (defalias 'wl-defface 'defface)
 
+(defun wl-read-event-char ()
+  "Get the next event."
+  (let ((event (next-command-event)))
+    (sit-for 0)
+    ;; We junk all non-key events.  Is this naughty?
+    (while (not (or (key-press-event-p event)
+                   (button-press-event-p event)))
+      (dispatch-event event)
+      (setq event (next-command-event)))
+    (cons (and (key-press-event-p event)
+              (event-to-character event))
+         event)))
+
 (require 'product)
 (product-provide (provide 'wl-xmas) (require 'wl-version))