X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-gnus3.el;h=38ef4a432734dd8bd6d9314c597f5cff75e86ebc;hb=d01db0a892b1dedf50de104691118e631bd04671;hp=185812fdc9189ba585ff70aab908a929c630dee2;hpb=6f60f010f0797bb67af3aa0bf0f202b61ad7b72d;p=elisp%2Ftm.git

diff --git a/tm-gnus3.el b/tm-gnus3.el
index 185812f..38ef4a4 100644
--- a/tm-gnus3.el
+++ b/tm-gnus3.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: tm-gnus3.el,v 3.2 1994/08/31 12:07:15 morioka Exp $
+;;; $Id: tm-gnus3.el,v 5.4 1994/10/25 08:29:17 morioka Exp $
 ;;;
 
 (provide 'tm-gnus3)
@@ -8,36 +8,19 @@
 (require 'tm-view)
 (require 'tl-list)
 
-(if (and (null gnus-Startup-hook)
-	 (boundp 'gnus-startup-hook))
-    (setq gnus-Startup-hook gnus-startup-hook)
-  )
-(if (and (null gnus-Select-group-hook)
-	 (boundp 'gnus-select-group-hook))
-    (setq gnus-Select-group-hook gnus-select-group-hook)
-  )
-(if (and (null gnus-Subject-mode-hook)
-	 (boundp 'gnus-summary-mode-hook))
-    (setq gnus-Subject-mode-hook gnus-summary-mode-hook)
-  )
-(if (and (null gnus-Article-mode-hook)
-	 (boundp 'gnus-article-mode-hook))
-    (setq gnus-Article-mode-hook gnus-article-mode-hook)
-  )
-(if (and (null gnus-Article-prepare-hook)
-	 (boundp 'gnus-article-prepare-hook))
-    (setq gnus-Article-prepare-hook gnus-article-prepare-hook)
-  )
-
 (setq mime/go-to-top-node-method-alist
       (put-alist 'gnus-Article-mode
 		 (if (string-match (regexp-quote "3.14.4") gnus-version)
 		     (function
 		      (lambda ()
+			(mime/exit-view-mode)
+			(delete-other-windows)
 			(gnus-Article-show-summary)
 			))
 		   (function
 		    (lambda ()
+		      (mime/exit-view-mode)
+		      (delete-other-windows)
 		      (gnus-Article-show-subjects)
 		      )))
 		 mime/go-to-top-node-method-alist))
@@ -49,20 +32,10 @@
     (gnus-Subject-select-article t t)
     )
   (pop-to-buffer gnus-Article-buffer t)
-  (mime/view-mode)
+  (mime/viewer-mode)
   )
 
-(add-hook 'gnus-Select-group-hook
-	  (function
-	   (lambda ()
-	     (mapcar (function
-		      (lambda (header)
-			(nntp-set-header-subject
-			 header
-			 (mime/decode-string (gnus-header-subject header))
-			 )))
-		     gnus-newsgroup-headers)
-	     )))
+(add-hook 'gnus-Select-group-hook (function tm-gnus/decode-summary-subjects))
 
 (define-key gnus-Subject-mode-map
   "\et" 'tm-gnus/toggle-mime-header-decoding-mode)
@@ -72,11 +45,7 @@
 
 (fset 'gnus-Article-set-mode-line 'tm-gnus/article-set-mode-line)
 (add-hook 'gnus-Article-prepare-hook
-	  (function
-	   (lambda ()
-	     (if mime/header-decoding-mode
-		 (mime/decode-message-header)
-	       ))) t)
+	  (function mime/decode-message-header-if-you-need) t)
 
 (if (not (string-match "^GNUS 3\.14\.4" gnus-version))
     (progn