From: yamaoka <yamaoka>
Date: Tue, 27 Jun 2000 00:11:13 +0000 (+0000)
Subject: Sync
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1c01617a89fbb2adbea4855e392d3370ca8e418d;p=elisp%2Fgnus.git-

Sync
with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index dd895af..cd7dcaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-27  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-vers.el (gnus-revision-number): Increment to 04.
+
+	* lisp/gnus-sum.el (gnus-mime-extract-message/rfc822): Use
+	`mime-insert-entity-content' instead of obsolete functions.
+
 2000-06-13  Hirokazu FUKUI  <hfukui@sannet.ne.jp>
 
 	* lisp/gnus-bbdb.el(gnus-bbdb/update-record): Fix to fetch last
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c243896..9378c23 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9698,40 +9698,31 @@ If REVERSE, save parts that do not match TYPE."
 
 (defun gnus-mime-extract-message/rfc822 (entity situation)
   (let (group article num cwin swin cur)
-    (with-current-buffer (mime-entity-buffer entity)
-      (save-restriction
-	(narrow-to-region (mime-entity-body-start entity)
-			  (mime-entity-body-end entity))
-	(setq group (or (cdr (assq 'group situation))
-			(completing-read "Group: "
-					 gnus-active-hashtb
-					 nil
-					 (gnus-read-active-file-p)
-					 gnus-newsgroup-name))
-	      article (gnus-request-accept-article group)
-	      )
-	))
+    (with-temp-buffer
+      (mime-insert-entity-content entity)
+      (setq group (or (cdr (assq 'group situation))
+		      (completing-read "Group: "
+				       gnus-active-hashtb
+				       nil
+				       (gnus-read-active-file-p)
+				       gnus-newsgroup-name))
+	    article (gnus-request-accept-article group)))
     (when (and (consp article)
 	       (numberp (setq article (cdr article))))
       (setq num (1+ (or (cdr (assq 'number situation)) 0))
-	    cwin (get-buffer-window (current-buffer) t)
-	    )
+	    cwin (get-buffer-window (current-buffer) t))
       (save-window-excursion
 	(if (setq swin (get-buffer-window gnus-summary-buffer t))
 	    (select-window swin)
-	  (set-buffer gnus-summary-buffer)
-	  )
+	  (set-buffer gnus-summary-buffer))
 	(setq cur gnus-current-article)
 	(forward-line num)
 	(let (gnus-show-threads)
-	  (gnus-summary-goto-subject article t)
-	  )
+	  (gnus-summary-goto-subject article t))
 	(gnus-summary-clear-mark-forward 1)
-	(gnus-summary-goto-subject cur)
-	)
+	(gnus-summary-goto-subject cur))
       (when (and cwin (window-frame cwin))
-	(select-frame (window-frame cwin))
-	)
+	(select-frame (window-frame cwin)))
       (when (boundp 'mime-acting-situation-to-override)
 	(set-alist 'mime-acting-situation-to-override
 		   'group
@@ -9741,15 +9732,11 @@ If REVERSE, save parts that do not match TYPE."
 		   `(progn
 		      (save-current-buffer
 			(set-buffer gnus-group-buffer)
-			(gnus-activate-group ,group)
-			)
+			(gnus-activate-group ,group))
 		      (gnus-summary-goto-article ,cur
-						 gnus-show-all-headers)
-		      ))
+						 gnus-show-all-headers)))
 	(set-alist 'mime-acting-situation-to-override
-		   'number num)
-	)
-      )))
+		   'number num)))))
 
 (mime-add-condition
  'action '((type . message)(subtype . rfc822)
diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index d88ade0..e0a8d89 100644
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "03"
+(defconst gnus-revision-number "04"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.