From: yamaoka <yamaoka>
Date: Fri, 14 Apr 2000 03:41:11 +0000 (+0000)
Subject: Sync with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~125
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a6383133d789c7227f4088108abd3897a04a256;p=elisp%2Fgnus.git-

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

diff --git a/ChangeLog b/ChangeLog
index 76d8260..57aae35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-14  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-msg.el (gnus-summary-yank-message): Rewrite for the use
+	of the separated message frames; use `gnus-copy-article-buffer'.
+
 2000-04-13  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* lisp/gnus-vers.el (gnus-revision-number): Increment to 18.
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 270f800..4abb7dc 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -988,13 +988,33 @@ If YANK is non-nil, include the original article."
   (interactive
    (list (completing-read "Buffer: " (mapcar 'list (message-buffers)) nil t)
 	 current-prefix-arg))
-  (gnus-summary-iterate n
-    (let ((gnus-display-mime-function nil)
-	  (gnus-inhibit-treatment t))
-      (gnus-summary-select-article))
-    (save-excursion
-      (set-buffer buffer)
-      (message-yank-buffer gnus-article-buffer))))
+  (when (gnus-buffer-live-p buffer)
+    (let ((summary-frame (selected-frame))
+	  (message-frame (when (static-if (featurep 'xemacs)
+				   (device-on-window-system-p)
+				 window-system)
+			   (let ((window (get-buffer-window buffer t)))
+			     (when window
+			       (window-frame window)))))
+	  (separator (concat "^" (regexp-quote mail-header-separator)
+			     "\n")))
+      (gnus-summary-iterate n
+	(gnus-summary-select-article)
+	(gnus-copy-article-buffer)
+	(when (frame-live-p message-frame)
+	  (raise-frame message-frame)
+	  (select-frame message-frame))
+	(with-current-buffer buffer
+	  (when (save-excursion
+		  (beginning-of-line)
+		  (let (case-fold-search)
+		    (and (not (re-search-backward separator nil t))
+			 (re-search-forward separator nil t))))
+	    (goto-char (match-end 0)))
+	  (message-yank-buffer gnus-article-copy))
+	(select-frame summary-frame))
+      (when (frame-live-p message-frame)
+	(select-frame message-frame)))))
 
 (defun gnus-debug ()
   "Attempts to go through the Gnus source file and report what variables have been changed.