* wl-message.el (wl-mmelmo-message-redisplay): Use `mime-display-message'

 instead of `wl-mime-display-message'.

* wl-mime.el (toplevel): Removed compatibility workaround
 for SEMI 1.13.4. or earlier and FLIM 1.12.7 or earlier.
(wl-mime-display-message): Abolished.
(wl-mime-entity-read-field): Ditto.
(wl-mime-combine-message/partial-pieces): Use `mime-entity-read-field'
 instead of `wl-mime-entity-read-field'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a03194a..6be9471 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-message.el (wl-mmelmo-message-redisplay): Use
+       `mime-display-message' instead of `wl-mime-display-message'.
+
+       * wl-mime.el (toplevel): Removed compatibility workaround
+       for SEMI 1.13.4. or earlier and FLIM 1.12.7 or earlier.
+       (wl-mime-display-message): Abolished.
+       (wl-mime-entity-read-field): Ditto.
+       (wl-mime-combine-message/partial-pieces): Use
+       `mime-entity-read-field' instead of `wl-mime-entity-read-field'.
+
 2000-10-27  OKAZAKI Tetsurou  <okazaki@be.to>
 
        * wl-template.el: Doc fixes.

diff --git a/wl/wl-message.el b/wl/wl-message.el
index bec3f93..9053063 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -438,8 +438,8 @@
                (setq mmelmo-imap4-skipped-parts nil)
                ;; mime-display-message sets buffer-read-only variable as t.
                ;; which makes buffer read-only status confused...
-               (wl-mime-display-message cur-entity view-message-buffer
-                                        nil nil 'mmelmo-original-mode)
+               (mime-display-message cur-entity view-message-buffer
+                                     nil nil 'mmelmo-original-mode)
                (if mmelmo-imap4-skipped-parts
                    (progn
                      (message "Skipped fetching of %s."

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 3b182f4..8498cb7 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -68,86 +68,6 @@ By setting following-method as yank-content."
 
 (defalias 'wl-draft-enclose-digest-region 'mime-edit-enclose-digest-region)
 
-;; SEMI 1.13.5 or later.
-;; (mime-display-message
-;;  MESSAGE &optional
-;;  PREVIEW-BUFFER MOTHER DEFAULT-KEYMAP-OR-FUNCTION ORIGINAL-MAJOR-MODE)
-;; SEMI 1.13.4 or earlier.
-;; (mime-display-message
-;;  MESSAGE &optional
-;;  PREVIEW-BUFFER MOTHER DEFAULT-KEYMAP-OR-FUNCTION)
-(static-if (or (and mime-user-interface-product
-                   (eq (nth 0 (aref mime-user-interface-product 1)) 1)
-                   (>= (nth 1 (aref mime-user-interface-product 1)) 14))
-              (and mime-user-interface-product
-                   (eq (nth 0 (aref mime-user-interface-product 1)) 1)
-                   (eq (nth 1 (aref mime-user-interface-product 1)) 13)
-                   (>= (nth 2 (aref mime-user-interface-product 1)) 5)))
-    ;; Has original-major-mode optional argument.
-    (defalias 'wl-mime-display-message 'mime-display-message)
-  (defmacro wl-mime-display-message (message &optional
-                                            preview-buffer mother
-                                            default-keymap-or-function
-                                            original-major-mode)
-    (` (mime-display-message (, message) (, preview-buffer) (, mother)
-                            (, default-keymap-or-function))))
-  ;; User agent field of XEmacs has problem on SEMI 1.13.4 or earlier.
-  (setq mime-edit-user-agent-value
-       (concat
-        (mime-product-name mime-user-interface-product) "/"
-        (mapconcat
-         #'number-to-string
-         (mime-product-version mime-user-interface-product) ".")
-        " (" (mime-product-code-name mime-user-interface-product)
-        ") " (mime-product-name mime-library-product)
-        "/" (mapconcat #'number-to-string
-                       (mime-product-version mime-library-product) ".")
-        " (" (mime-product-code-name mime-library-product) ") "
-        (if (featurep 'xemacs)
-            (concat
-             (if (featurep 'mule) "MULE")
-             " XEmacs"
-             (if (string-match "\\s +\\((\\|\\\"\\)" emacs-version)
-                 (concat "/" (substring emacs-version 0
-                                        (match-beginning 0))
-                         (if (and (boundp 'xemacs-betaname)
-                                  ;; It does not exist in XEmacs
-                                  ;; versions prior to 20.3.
-                                  xemacs-betaname)
-                             (concat " " xemacs-betaname)
-                           "")
-                         " (" xemacs-codename ") ("
-                         system-configuration ")")
-               " (" emacs-version ")"))
-          (let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
-                         (substring emacs-version 0 (match-beginning 0))
-                       emacs-version)))
-            (if (featurep 'mule)
-                (if (boundp 'enable-multibyte-characters)
-                    (concat "Emacs/" ver
-                            " (" system-configuration ")"
-                            (if enable-multibyte-characters
-                                (concat " MULE/" mule-version)
-                              " (with unibyte mode)")
-                            (if (featurep 'meadow)
-                                (let ((mver (Meadow-version)))
-                                  (if (string-match "^Meadow-" mver)
-                                      (concat " Meadow/"
-                                              (substring mver
-                                                         (match-end 0)))))))
-                  (concat "MULE/" mule-version
-                          " (based on Emacs " ver ")"))
-              (concat "Emacs/" ver " (" system-configuration ")")))))))
-
-;; FLIM 1.12.7
-;; (mime-read-field FIELD-NAME &optional ENTITY)
-;; FLIM 1.13.2 or later
-;; (mime-entity-read-field ENTITY FIELD-NAME)
-(static-if (fboundp 'mime-entity-read-field)
-    (defalias 'wl-mime-entity-read-field 'mime-entity-read-field)
-  (defmacro wl-mime-entity-read-field (entity field-name)
-    (` (mime-read-field (, field-name) (, entity)))))
-
 (defun wl-draft-preview-message ()
   ""
   (interactive)
@@ -294,7 +214,7 @@ By setting following-method as yank-content."
       (setq subject-id
            (eword-decode-string
             (decode-mime-charset-string
-             (wl-mime-entity-read-field entity 'Subject)
+             (mime-entity-read-field entity 'Subject)
              wl-summary-buffer-mime-charset)))
       (if (string-match "[0-9\n]+" subject-id)
          (setq subject-id (substring subject-id 0 (match-beginning 0))))