Synch with `t-gnus-6_15-quimby'.

diff --git a/ChangeLog b/ChangeLog
index 639cd45..58981f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-11  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * lisp/gnus-art.el (gnus-request-article-this-buffer): Copy an
+       article from `gnus-original-article-buffer' to
+       `gnus-article-buffer'.  Generate `gnus-original-article-buffer'
+       safely.
+
 2001-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Use

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 6825e9a..8869992 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4805,7 +4805,15 @@ T-gnus change: Insert an article into `gnus-original-article-buffer'."
                        (gnus-group-enter-directory dir))))))))
          (setq gnus-original-article (cons group article))
 
-         (set-buffer gnus-original-article-buffer)
+         ;; The current buffer is `gnus-original-article-buffer'. 
+         (if (get-buffer gnus-original-article-buffer)
+             (set-buffer gnus-original-article-buffer)
+           (set-buffer (gnus-get-buffer-create gnus-original-article-buffer))
+           (set-buffer-multibyte nil)
+           (buffer-disable-undo)
+           (setq major-mode 'gnus-original-article-mode)
+           (setq buffer-read-only nil))
+
          (cond
           ;; Refuse to select canceled articles.
           ((and (numberp article)
@@ -4873,6 +4881,9 @@ T-gnus change: Insert an article into `gnus-original-article-buffer'."
       ;; Associate this article with the current summary buffer.
       (setq gnus-article-current-summary gnus-summary-buffer)
 
+      ;; Copy the requested article from `gnus-original-article-buffer'.
+      (insert-buffer gnus-original-article-buffer)
+
       ;; Decode charsets.
       (run-hooks 'gnus-article-decode-hook)
       ;; Mark article as decoded or not.