tm 7.41.1.

[elisp/tm.git] / gnus / tm-gnus4.el

diff --git a/gnus/tm-gnus4.el b/gnus/tm-gnus4.el
index d37351c..9b227dc 100644 (file)
--- a/gnus/tm-gnus4.el
+++ b/gnus/tm-gnus4.el
@@ -8,7 +8,7 @@
 ;;; modified by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1993/11/20 (merged tm-gnus5.el)
-;;; Version: $Revision: 7.9 $
+;;; Version: $Revision: 7.16 $
 ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -26,6 +26,8 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with This program.  If not, write to the Free Software
 ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tl-str)
 (require 'tl-misc)
@@ -35,10 +37,10 @@
 ;;;
 
 (defconst tm-gnus/RCS-ID
-  "$Id: tm-gnus4.el,v 7.9 1995/12/03 17:30:57 morioka Exp $")
+  "$Id: tm-gnus4.el,v 7.16 1996/01/23 04:56:21 morioka Exp $")
 
 (defconst tm-gnus/version
-  (concat (get-version-string tm-gnus/RCS-ID) " for 3.15 .. 5.1"))
+  (concat (get-version-string tm-gnus/RCS-ID) " for 3.15 .. 5.1.*"))
 
 
 ;;; @ variable
@@ -60,7 +62,8 @@ This variable is set to `gnus-show-mime'.")
 (defun tm-gnus/view-message (arg)
   "MIME decode and play this message."
   (interactive "P")
-  (let ((gnus-break-pages nil))
+  (let ((gnus-break-pages nil)
+       (gnus-show-mime nil))
     (gnus-summary-select-article t t)
     )
   (pop-to-buffer gnus-article-buffer t)
@@ -85,7 +88,9 @@ This variable is set to `gnus-show-mime'.")
          (function gnus-article-push-button))
     (mime/viewer-mode
      nil nil nil tm-gnus/original-article-buffer gnus-article-buffer)
-    (run-hooks 'tm-gnus/article-prepare-hook)
+    (let (buffer-read-only)
+      (run-hooks 'tm-gnus/article-prepare-hook)
+      )
     ))
 
 (defun tm-gnus/summary-scroll-down ()
@@ -112,6 +117,9 @@ This variable is set to `gnus-show-mime'.")
     (set-alist 'mime-viewer/quitting-method-alist
               'gnus-article-mode
               (function mime-viewer/quitting-method-for-gnus4))
+    (set-alist 'mime-viewer/show-summary-method
+              'gnus-article-mode
+              (function mime-viewer/quitting-method-for-gnus4))
     )))
 
 
@@ -146,7 +154,7 @@ This variable is set to `gnus-show-mime'.")
   "\e\r" (function tm-gnus/summary-scroll-down))
 
 (defun tm-gnus/article-reset-variable ()
-  (setq gnus-original-article-buffer gnus-article-buffer)
+  (setq gnus-original-article-buffer nil)
   (setq tm-gnus/automatic-mime-preview nil)
   (gnus-article-mode)
   (setq buffer-read-only nil)
@@ -182,10 +190,18 @@ This variable is set to `gnus-show-mime'.")
        (make-local-variable 'tm:mother-button-dispatcher)
        (setq tm:mother-button-dispatcher
              (function gnus-article-push-button))
-       (mime/viewer-mode
-        nil nil nil tm-gnus/original-article-buffer gnus-article-buffer)
-       (gnus-article-show-summary)
-       (run-hooks 'tm-gnus/article-prepare-hook)
+       (save-window-excursion
+         (mime/viewer-mode
+          nil nil nil tm-gnus/original-article-buffer gnus-article-buffer)
+         )
+       (setq tm-gnus/automatic-mime-preview t)
+       (setq gnus-original-article-buffer tm-gnus/original-article-buffer)
+       (let (buffer-read-only)
+         (run-hooks 'tm-gnus/article-prepare-hook)
+         )
+       (if (featurep 'tm-gd3)
+           (setq buffer-read-only nil)
+         )
        )))
 
 (setq gnus-show-mime-method
@@ -211,9 +227,17 @@ This variable is set to `gnus-show-mime'.")
 
 (tm-gnus/bbdb-setup)
 
+(call-after-loaded
+ 'bbdb
+ (function
+  (lambda ()
+    (require 'tm-bbdb)
+    )))
+
 
 ;;; @ end
 ;;;
 
 (provide 'tm-gnus4)
 
+;;; tm-gnus4.el ends here