Sync up with emh-1_6_0-pre1.

diff --git a/ChangeLog b/ChangeLog
index a2abcfd..05051c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+1998-06-18  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emh.el (emh-header-display): Guard
+       `mime-view-visible-field-list' too.
+
+       * emh.el (emh-header-display): Use `mime-view-ignored-field-list'
+       instead of `mime-view-ignored-field-regexp'.
+
+1998-06-18  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emh.el (mh-display-msg): Use `mime-view-buffer'.
+
+1998-06-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emh-comp.el (emh-yank-cur-msg-with-no-filter): Rename
+       `mime-preview-text/plain-hook' to `mime-display-text/plain-hook'.
+
+1998-06-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emh.el: Modify for SEMI 1.7.
+       (emh-display-header-hook): Renamed from
+       `emh-content-header-filter-hook'.
+       (emh-header-presentation-method): New function; setup for
+       `mime-header-presentation-method-alist'; abolish
+       `emh-content-header-filter'.
+
+\f
 1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * EMH: Version 1.5.1 was released.

diff --git a/emh-comp.el b/emh-comp.el
index 130829c..a326f1f 100644 (file)
--- a/emh-comp.el
+++ b/emh-comp.el
@@ -460,7 +460,7 @@ yanked message will be deleted."
        (set-buffer mh-show-buffer)     ; Find displayed message
        (let ((mh-ins-str
               (if mime-raw-buffer
-                  (let (mime-preview-text/plain-hook buf)
+                  (let (mime-display-text/plain-hook buf)
                     (prog1
                         (save-window-excursion
                           (set-buffer mime-raw-buffer)

diff --git a/emh.el b/emh.el
index 4594479..74d906f 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -38,7 +38,7 @@
 ;;; @ version
 ;;;
 
-(defconst emh-version "1.4.0")
+(defconst emh-version "1.6.0")
 
 
 ;;; @ variable
@@ -105,8 +105,7 @@ nil, `emh-automatic-mime-preview' is used as default value."
                 (setq buffer-read-only t)
                 (setq buffer-file-name msg-filename)
                 (mh-show-mode)
-                (mime-view-mode nil nil nil
-                                aname (concat "show-" folder))
+                (mime-view-buffer aname (concat "show-" folder))
                 (goto-char (point-min))
                 )
             (let ((clean-message-header mh-clean-message-header)
@@ -195,7 +194,8 @@ With arg, turn MIME processing on if arg is positive."
 (defun emh-header-display ()
   (interactive)
   (mh-invalidate-show-buffer)
-  (let ((mime-view-ignored-field-regexp "^:$")
+  (let (mime-view-ignored-field-list
+       mime-view-visible-field-list
        emh-decode-encoded-word)
     (mh-header-display)
     ))
@@ -228,26 +228,25 @@ digest are inserted into the folder after that message."
 
 (set-alist 'mime-raw-representation-type-alist 'mh-show-mode 'binary)
 
-(defvar emh-content-header-filter-hook
-  (if window-system
-      '(emh-highlight-header)
-    )
+
+(defvar emh-display-header-hook (if window-system
+                                   '(emh-highlight-header)
+                                 )
   "Hook for header filtering.")
 
 (autoload 'emh-highlight-header "emh-face")
 
-(defun emh-content-header-filter ()
-  "Header filter for mime-view.
-It is registered to variable `mime-view-content-header-filter-alist'."
-  (goto-char (point-min))
-  (mime-view-cut-header)
-  (eword-decode-header default-mime-charset)
-  (run-hooks 'emh-content-header-filter-hook)
+(defun emh-header-presentation-method (entity situation)
+  (mime-insert-decoded-header
+   entity
+   mime-view-ignored-field-list mime-view-visible-field-list
+   default-mime-charset)
+  (run-hooks 'emh-display-header-hook)
   )
 
-(set-alist 'mime-view-content-header-filter-alist
-          'mh-show-mode
-          (function emh-content-header-filter))
+(set-alist 'mime-header-presentation-method-alist
+          'mh-show-mode #'emh-header-presentation-method)
+
 
 (defun emh-quitting-method ()
   (let ((buf (current-buffer)))
@@ -264,9 +263,7 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 
 (set-alist 'mime-preview-quitting-method-alist
           'mh-show-mode #'emh-quitting-method)
-(set-alist 'mime-view-show-summary-method
-          'mh-show-mode
-          (function emh-quitting-method))
+
 
 (defun emh-following-method (buf)
   (save-excursion
@@ -282,22 +279,21 @@ It is registered to variable `mime-view-content-header-filter-alist'."
       (goto-char last)
       )))
 
-(set-alist 'mime-view-following-method-alist
-          'mh-show-mode
-          (function emh-following-method))
+(set-alist 'mime-preview-following-method-alist
+          'mh-show-mode #'emh-following-method)
 
 
 ;;; @@ for mime-partial
 ;;;
 
-(autoload 'mime-method-to-combine-message/partial-pieces
+(autoload 'mime-combine-message/partial-pieces-automatically
   "mime-partial"
   "Internal method to combine message/partial messages automatically.")
 
 (mime-add-condition
  'action
  '((type . message)(subtype . partial)
-   (method . mime-method-to-combine-message/partial-pieces)
+   (method . mime-combine-message/partial-pieces-automatically)
    (major-mode . mh-show-mode)
    (summary-buffer-exp
     . (and (or (string-match "^article-\\(.+\\)$"