Merge gnus-6_6.

diff --git a/ChangeLog b/ChangeLog
index d09700b..25d53e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-06-24  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/gnus-sum.el (gnus-request-partial-message): Fix typo.
+
+1998-06-22  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.6.0.
+       (gnus-version): Modify for SEMI 1.8.
+
+       * lisp/gnus-sum.el: Modify for interface change in SEMI 1.8 about
+       automatic message/partial combining.
+
 1998-06-19  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * lisp/gnus.el (gnus-version-number): Update to 6.5.0.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 07a1b65..f1837ac 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8923,9 +8923,17 @@ save those articles instead."
 ;;; @ for mime-partial
 ;;;
 
-(defun gnus-mime-partial-preview-function ()
-  (gnus-summary-preview-mime-message (gnus-summary-article-number))
-  )
+(defun gnus-request-partial-message ()
+  (save-excursion
+    (let ((number (gnus-summary-article-number))
+         (group gnus-newsgroup-name)
+         (mother gnus-article-buffer))
+      (set-buffer (get-buffer-create " *Partial Article*"))
+      (erase-buffer)
+      (setq mime-preview-buffer mother)
+      (gnus-request-article-this-buffer number group)
+      (mime-parse-buffer)
+      )))
 
 (autoload 'mime-combine-message/partial-pieces-automatically
   "mime-partial"
@@ -8936,12 +8944,9 @@ save those articles instead."
           (major-mode . gnus-original-article-mode)
           (method . mime-combine-message/partial-pieces-automatically)
           (summary-buffer-exp . gnus-summary-buffer)
+          (request-partial-message-method . gnus-request-partial-message)
           ))
 
-(set-alist 'mime-view-partial-message-method-alist
-          'gnus-original-article-mode
-          'gnus-mime-partial-preview-function)
-
 
 ;;; @ end
 ;;;

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 116ad40..a41ad38 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.5.0"
+(defconst gnus-version-number "6.6.0"
   "Version number for this version of gnus.")
 
 (defconst gnus-version
-  (format "Semi-gnus %s (based on Gnus 5.6.11; for SEMI 1.7)"
+  (format "Semi-gnus %s (based on Gnus 5.6.11; for SEMI 1.8)"
           gnus-version-number)
   "Version string for this version of gnus.")