* gnus-art.el (gnus-article-add-button): Remove Mule 2 stuff.

* gnus-namazu.el: Don't autoload regexp-opt.
* gnus-util.el (gnus-read-event-char): Remove Mule 2 stuff.
* nnmail.el (nnmail-lazy): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 6c922ae..78ca0db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/gnus-art.el (gnus-article-add-button): Remove Mule 2 stuff.
+       * lisp/gnus-namazu.el: Don't autoload regexp-opt.
+       * lisp/gnus-util.el (gnus-read-event-char): Remove Mule 2 stuff.
+       * lisp/nnmail.el (nnmail-lazy): Ditto.
+
 2004-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (gnus-treat-smiley): Ignore Emacs version

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 84d47b8..57f481f 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6954,9 +6954,7 @@ specified by `gnus-button-alist'."
          (list 'gnus-callback fun)
          (and data (list 'gnus-data data))))
   (widget-convert-button 'link from to :action 'gnus-widget-press-button
-                        ;; Quote `:button-keymap' for Mule 2.3
-                        ;; but it won't work.
-                        ':button-keymap gnus-widget-button-keymap))
+                        :button-keymap gnus-widget-button-keymap))
 
 ;;; Internal functions:
 

diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index fec26cb..d33afb6 100644 (file)
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -102,10 +102,6 @@
 (require 'nnmail)
 (require 'gnus-sum)
 
-;; It is required for Mule 2.3.  See the file Mule23@1934.en.
-(eval-and-compile
-  (autoload 'regexp-opt "regexp-opt"))
-
 ;; To suppress byte-compile warning.
 (eval-when-compile
   (defvar nnml-directory)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 6bbcc70..455ed93 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -533,13 +533,7 @@ If N, return the Nth ancestor instead."
 
 (defun gnus-read-event-char (&optional prompt)
   "Get the next event."
-  (let ((event (condition-case nil
-                  (read-event prompt)
-                ;; `read-event' doesn't allow arguments in Mule 2.3
-                (wrong-number-of-arguments
-                 (when prompt
-                   (message "%s" prompt))
-                 (read-event)))))
+  (let ((event (read-event prompt)))
     ;; should be gnus-characterp, but this can't be called in XEmacs anyway
     (cons (and (numberp event) event) event)))
 

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 847861b..61dca60 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -381,12 +381,8 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                   (widget-apply (car (widget-get widget :children))
                                 :value-inline))
   :default-get (lambda (widget)
-                 ;;(widget-default-get
-                 ;; (widget-convert (widget-get widget :type))))
-                ;; `widget-default-get' isn't available in Mule 2.
-                (let ((w (widget-convert (widget-get widget :type))))
-                  (or (widget-get w :value)
-                      (widget-apply w :default-get))))
+                 (widget-default-get
+                  (widget-convert (widget-get widget :type))))
   :match (lambda (widget value)
            (widget-apply (widget-convert (widget-get widget :type))
                          :match value))