Merge gnus-6_5.

diff --git a/ChangeLog b/ChangeLog
index 441f853..d09700b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1998-06-19  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.5.0.
+       (gnus-version): Modify for SEMI 1.7.
+
+       * lisp/gnus-sum.el: Rename
+       `mime-method-to-combine-message/partial-pieces' to
+       `mime-combine-message/partial-pieces-automatically'.
+
+       * lisp/gnus-art.el (gnus-article-preview-mime-message): Use
+       `mime-view-buffer'.
+       (gnus-article-decode-encoded-word): Fix DOC-string.
+       (gnus-article-header-presentation-method): New function; abolish
+       `gnus-content-header-filter'.
+       Modify for SEMI 1.7.
+
 1998-06-18  Keisuke Mori   <ksk@ntts.com>
 
        * texi/gnus-ja.texi: Add "Select Methods".

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a028dc6..0508d68 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1958,16 +1958,14 @@ commands:
            default-mime-charset))
        )
     (save-excursion
-      (mime-view-mode nil nil nil gnus-original-article-buffer
-                     gnus-article-buffer
-                     gnus-article-mode-map)
+      (mime-view-buffer gnus-original-article-buffer gnus-article-buffer
+                       nil gnus-article-mode-map)
       ))
   (run-hooks 'gnus-mime-article-prepare-hook)
   )
 
 (defun gnus-article-decode-encoded-word ()
-  "Header filter for gnus-article-mode.
-It is registered to variable `mime-view-content-header-filter-alist'."
+  "Header filter for gnus-article-mode."
   (let ((charset (save-excursion
                   (set-buffer gnus-summary-buffer)
                   default-mime-charset)))
@@ -3237,10 +3235,13 @@ forbidden in URL encoding."
 ;;; @ for mime-view
 ;;;
 
-(defun gnus-content-header-filter ()
-  "Header filter for mime-view.
-It is registered to variable `mime-view-content-header-filter-alist'."
-  (eword-decode-header default-mime-charset))
+(defun gnus-article-header-presentation-method (entity situation)
+  (mime-insert-decoded-header entity nil nil default-mime-charset)
+  )
+
+(set-alist 'mime-header-presentation-method-alist
+          'gnus-original-article-mode
+          #'gnus-article-header-presentation-method)
 
 (defun mime-preview-quitting-method-for-gnus ()
   (if (not gnus-show-mime)
@@ -3252,10 +3253,6 @@ It is registered to variable `mime-view-content-header-filter-alist'."
       (gnus-summary-select-article nil t)
     ))
 
-(set-alist 'mime-view-content-header-filter-alist
-          'gnus-original-article-mode
-          #'gnus-content-header-filter)
-
 (set-alist 'mime-raw-representation-type-alist
           'gnus-original-article-mode 'binary)
 
@@ -3275,9 +3272,8 @@ It is registered to variable `mime-view-content-header-filter-alist'."
   (goto-char (point-min))
   )
 
-(set-alist 'mime-view-following-method-alist
-          'gnus-original-article-mode
-          #'gnus-following-method)
+(set-alist 'mime-preview-following-method-alist
+          'gnus-original-article-mode #'gnus-following-method)
 
 
 ;;; @ end

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index cf6bb24..07a1b65 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8927,14 +8927,14 @@ save those articles instead."
   (gnus-summary-preview-mime-message (gnus-summary-article-number))
   )
 
-(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)
           (major-mode . gnus-original-article-mode)
+          (method . mime-combine-message/partial-pieces-automatically)
           (summary-buffer-exp . gnus-summary-buffer)
           ))
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 0f34573..116ad40 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -250,11 +250,11 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "6.4.0"
+(defconst gnus-version-number "6.5.0"
   "Version number for this version of gnus.")
 
 (defconst gnus-version
-  (format "Semi-gnus %s (based on Gnus 5.6.11; for SEMI 1.5)"
+  (format "Semi-gnus %s (based on Gnus 5.6.11; for SEMI 1.7)"
           gnus-version-number)
   "Version string for this version of gnus.")