Sync up with SEMI 1.5.4.

diff --git a/ChangeLog b/ChangeLog
index 60242ce..f9de6ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+1998-06-09  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * WEMI: Version 1.5.4 (Manazuru) released.
+
+1998-06-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-normalize-body): Abolish unused local
+       variable.
+
+1998-06-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-translate-single-part-tag): Add new
+       argument `boundary'.
+       (mime-edit-translate-region): Modify for
+       `mime-edit-translate-single-part-tag'.
+
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-w3.el (mime-put-keymap-region): New macro.
+       (mime-preview-text/html): Use macro `mime-put-keymap-region'.
+
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI-ELS (semi-modules-to-compile): Add 'mime-w3 if w3 is found.
+
+       * semi-setup.el (mime-setup-enable-inline-html): New variable; add
+       setting for mime-w3.el conditionally.
+
+       * mime-w3.el: New module.
+
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el (mime-preview-multipart/alternative): Fix typo.
+
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-x-emacs-value): Check
+       `enable-multibyte-characters' is bound or not.
+
+\f
 1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * WEMI: Version 1.5.3 (Nebukawa) released.

diff --git a/Makefile b/Makefile
index ae1a880..cdb239e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for WEMI.
 #
 
-VERSION = 1.5.3
+VERSION = 1.5.4
 PACKAGE = wemi
 
 SHELL  = /bin/sh

diff --git a/SEMI-ELS b/SEMI-ELS
index 6fabefa..c12fb0a 100644 (file)
--- a/SEMI-ELS
+++ b/SEMI-ELS
@@ -1,7 +1,8 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; $Id: SEMI-ELS,v 1.2.12.1 1998-04-13 17:28:31 morioka Exp $
-;;;
+
+;; SEMI-ELS: list of SEMI modules to install
+
+;;; Code:
 
 (setq semi-modules-to-compile
       '(signature
@@ -26,6 +27,7 @@
             )))
        '((mailcrypt    mime-pgp mime-mc)
          (bbdb         mime-bbdb)
+         (w3           mime-w3)
          ))
 
 (if (or (string-match "XEmacs" emacs-version)

diff --git a/mime-edit.el b/mime-edit.el
index e3e32e1..56e77b0 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1903,17 +1903,15 @@ Content-Transfer-Encoding: 7bit
              (insert encoding)))
        ))))
 
-(defun mime-edit-translate-single-part-tag (&optional prefix)
+(defun mime-edit-translate-single-part-tag (boundary &optional prefix)
   "Translate single-part-tag to MIME header."
   (if (re-search-forward mime-edit-single-part-tag-regexp nil t)
       (let* ((beg (match-beginning 0))
             (end (match-end 0))
-            (tag (buffer-substring beg end))
-            )
+            (tag (buffer-substring beg end)))
        (delete-region beg end)
        (let ((contype (mime-edit-get-contype tag))
-             (encoding (mime-edit-get-encoding tag))
-             )
+             (encoding (mime-edit-get-encoding tag)))
          (insert (concat prefix "--" boundary "\n"))
          (save-restriction
            (narrow-to-region (point)(point))
@@ -1958,9 +1956,8 @@ Content-Transfer-Encoding: 7bit
         (t
          ;; It's a multipart message.
          (goto-char (point-min))
-         (and (mime-edit-translate-single-part-tag)
-              (while (mime-edit-translate-single-part-tag "\n"))
-              )
+         (and (mime-edit-translate-single-part-tag boundary)
+              (while (mime-edit-translate-single-part-tag boundary "\n")))
          ;; Define Content-Type as "multipart/mixed".
          (setq contype
                (concat "multipart/mixed;\n boundary=\"" boundary "\""))
@@ -2093,9 +2090,7 @@ Content-Transfer-Encoding: 7bit
        ;; encoded.
        (let* ((encoding "base64")      ;Encode in BASE64 by default.
               (beg (mime-edit-content-beginning))
-              (end (mime-edit-content-end))
-              (body (buffer-substring beg end))
-              )
+              (end (mime-edit-content-end)))
          (mime-encode-region beg end encoding)
          (mime-edit-define-encoding encoding))
        (forward-line 1)

diff --git a/mime-view.el b/mime-view.el
index 8dd621c..117cfcd 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -589,7 +589,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
                                               (copy-alist situation))))
        )
       (setq children (cdr children)
-           situation (cdr situations)
+           situations (cdr situations)
            i (1+ i))
       )))
 

diff --git a/semi-setup.el b/semi-setup.el
index 33ec99c..10bc81a 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -45,11 +45,35 @@
   )
 
 
+;; for text/html
+(defvar mime-setup-enable-inline-html
+  (module-installed-p 'w3)
+  "*If it is non-nil, semi-setup sets up to use mime-w3.")
+
+(if mime-setup-enable-inline-html
+    (call-after-loaded
+     'mime-view
+     (function
+      (lambda ()
+       (autoload 'mime-preview-text/html "mime-w3")
+       
+       (ctree-set-calist-strictly
+        'mime-preview-condition
+        '((type . text)(subtype . html)
+          (body . visible)
+          (body-presentation-method . mime-preview-text/html)))
+       
+       (set-alist 'mime-view-type-subtype-score-alist
+                  '(text . html) 3)
+       )))
+  )
+
+
+;; for PGP
 (defvar mime-setup-enable-pgp
   (module-installed-p 'mailcrypt)
   "*If it is non-nil, semi-setup sets uf to use mime-pgp.")
 
-;; for PGP
 (if mime-setup-enable-pgp
     (eval-after-load "mime-view"
       '(progn