X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gnus%2Ftm-sgnus.el;h=095be12871e88030d4e46c1baeb91fcc1c25818f;hb=9e52dec7d9b91a0e9a0de21e4cabd0ac36d273c0;hp=3ce21364d833932e2924dd1b42b2b100252c3940;hpb=381df96561a159ec072dc0b4936134405a5d68cd;p=elisp%2Ftm.git

diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el
index 3ce2136..095be12 100644
--- a/gnus/tm-sgnus.el
+++ b/gnus/tm-sgnus.el
@@ -1,32 +1,47 @@
 ;;;
-;;; tm-sgnus.el --- tm-gnus module for September GNUS
+;;; tm-sgnus.el --- tm-gnus module for September Gnus
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1995 MORIOKA Tomohiko
+;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Created: 1995/09/24
+;;; Version: $Revision: 7.61 $
 ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; 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-list)
 (require 'tl-misc)
+(require 'tm-view)
 (require 'gnus)
 
-(autoload 'mime/viewer-mode "tm-view" "View MIME message." t)
-(autoload 'mime/decode-message-header
-  "tm-ew-d" "Decode MIME encoded-words in message header." t)
-(autoload 'mime-eword/decode-string
-  "tm-ew-d" "Decode MIME encoded-words in string." t)
+(eval-when-compile (require 'cl))
 
 
 ;;; @ version
 ;;;
 
 (defconst tm-gnus/RCS-ID
-  "$Id: tm-sgnus.el,v 7.12 1995/10/29 14:13:08 morioka Exp $")
+  "$Id: tm-sgnus.el,v 7.61 1996/05/20 15:29:30 morioka Exp $")
 
 (defconst tm-gnus/version
   (concat (get-version-string tm-gnus/RCS-ID) " for September"))
@@ -69,50 +84,73 @@ This variable is set to `gnus-show-mime'.")
 
 (defun tm-gnus/summary-toggle-header (&optional arg)
   (interactive "P")
-  (if gnus-show-mime
-      (let ((mime-viewer/ignored-field-list
-	     (if (save-excursion
-		   (set-buffer gnus-article-buffer)
-		   (some-element
-		    (lambda (field)
-		      (rfc822/get-field-body field)
-		      )
-		    mime-viewer/ignored-field-list))
-		 mime-viewer/ignored-field-list)))
-	(gnus-summary-select-article t t)
+  (if tm-gnus/automatic-mime-preview
+      (let* ((hidden
+	      (save-excursion
+		(set-buffer gnus-article-buffer)
+		(text-property-any 
+		 (goto-char (point-min)) (search-forward "\n\n")
+		 'invisible t)
+		))
+	     (mime-viewer/redisplay t)
+	     )
+	(gnus-summary-select-article hidden t)
 	)
-    (gnus-summary-toggle-header arg)
-    ))
+    (gnus-summary-toggle-header arg))
+  )
 
 (define-key gnus-summary-mode-map "v" (function tm-gnus/view-message))
 (define-key gnus-summary-mode-map
   "\e\r" (function tm-gnus/summary-scroll-down))
-(define-key gnus-summary-mode-map
-  "t" (function tm-gnus/summary-toggle-header))
+(substitute-key-definition
+ 'gnus-summary-toggle-header
+ 'tm-gnus/summary-toggle-header gnus-summary-mode-map)
 
 
 ;;; @ for tm-view
 ;;;
 
+(defun tm-gnus/content-header-filter ()
+  (goto-char (point-min))
+  (mime-preview/cut-header)
+  (mime-charset-decode-region (point-min)(point-max)
+			      mime/default-coding-system)
+  (mime/decode-message-header)
+  )
+
+(set-alist 'mime-viewer/content-header-filter-alist
+	   'gnus-original-article-mode
+	   (function tm-gnus/content-header-filter))
+
+(set-alist 'mime-viewer/code-converter-alist
+	   'gnus-original-article-mode
+	   (function mime-charset-decode-region))
+
 (defun mime-viewer/quitting-method-for-sgnus ()
-  (mime-viewer/kill-buffer)
+  (if (not gnus-show-mime)
+      (mime-viewer/kill-buffer))
   (delete-other-windows)
   (gnus-article-show-summary)
-  (gnus-summary-display-article (gnus-summary-article-number))
-  )
+  (if (or (not gnus-show-mime)
+	  (null gnus-have-all-headers))
+      (gnus-summary-select-article nil t)
+    ))
 
-(call-after-loaded
- 'tm-view
- (lambda ()
-   (set-alist 'mime-viewer/quitting-method-alist
-	      'gnus-original-article-mode
-	      (function mime-viewer/quitting-method-for-sgnus))
-   ))
+(set-alist 'mime-viewer/quitting-method-alist
+	   'gnus-original-article-mode
+	   (function mime-viewer/quitting-method-for-sgnus))
+(set-alist 'mime-viewer/show-summary-method
+	   'gnus-original-article-mode
+	   (function mime-viewer/quitting-method-for-sgnus))
 
 
 ;;; @ for tm-partial
 ;;;
 
+(defun tm-gnus/partial-preview-function ()
+  (tm-gnus/view-message (gnus-summary-article-number))
+  )
+
 (call-after-loaded
  'tm-partial
  (lambda ()
@@ -124,72 +162,164 @@ This variable is set to `gnus-show-mime'.")
 		))
    (set-alist 'tm-partial/preview-article-method-alist
 	      'gnus-original-article-mode
-	      '(lambda ()
-		 (tm-gnus/view-message (gnus-summary-article-number))
-		 ))
+	      'tm-gnus/partial-preview-function)
    ))
 
 
-;;; @ summary filter
+;;; @ article filter
 ;;;
 
-(cond ((not (boundp 'nnheader-encoded-words-decoding))
-       (defun tm-gnus/decode-summary-from-and-subjects ()
-	 (mapcar (lambda (header)
-		   (let ((from (mail-header-from header))
-			 (subj (mail-header-subject header))
-			 )
-		     (mail-header-set-from
-		      header
-		      (if from
-			  (mime-eword/decode-string from)
-			""))
-		     (mail-header-set-subject
-		      header
-		      (if subj
-			  (mime-eword/decode-string subj)
-			""))
-		     ))
-		 gnus-newsgroup-headers)
-	 )
-       (add-hook 'gnus-select-group-hook
-		 (function tm-gnus/decode-summary-from-and-subjects))
-       ))
-
+(defun tm-gnus/article-reset-variable ()
+  (setq tm-gnus/automatic-mime-preview nil)
+  )
 
-;;; @ article filter
-;;;
+(add-hook 'gnus-article-prepare-hook 'tm-gnus/article-reset-variable)
 
 (defun tm-gnus/preview-article ()
   (make-local-variable 'tm:mother-button-dispatcher)
   (setq tm:mother-button-dispatcher
 	(function gnus-article-push-button))
-  (mime/viewer-mode nil nil nil gnus-original-article-buffer
-		    gnus-article-buffer)
+  (let ((mime-viewer/ignored-field-regexp "^:$")
+	(mime/default-coding-system
+	 (save-excursion
+	   (set-buffer gnus-summary-buffer)
+	   mime/default-coding-system)))
+    (mime/viewer-mode nil nil nil gnus-original-article-buffer
+		      gnus-article-buffer)
+    )
+  (setq tm-gnus/automatic-mime-preview t)
   (run-hooks 'tm-gnus/article-prepare-hook)
   )
 
 (setq gnus-show-mime-method (function tm-gnus/preview-article))
 
-(or (fboundp 'tm::gnus-article-hide-headers-if-wanted)
-    (fset 'tm::gnus-article-hide-headers-if-wanted
-	  (symbol-function 'gnus-article-hide-headers-if-wanted))
+(defun tm-gnus/article-decode-encoded-word ()
+  (character-decode-region (point-min)(point-max)
+			   (save-excursion
+			     (set-buffer gnus-summary-buffer)
+			     mime/default-coding-system))
+  (mime/decode-message-header)
+  (run-hooks 'tm-gnus/article-prepare-hook)
+  )
+
+(setq gnus-decode-encoded-word-method
+      (function tm-gnus/article-decode-encoded-word))
+
+
+;;; @ for MULE
+;;;
+
+(defvar gnus-newsgroup-default-coding-system-alist nil)
+
+(defun gnus-set-newsgroup-default-coding-system (ng cs)
+  "Define CS as default coding system for newsgroup NG."
+  (set-alist 'gnus-newsgroup-default-coding-system-alist
+	     (concat "^" (regexp-quote ng) "\\($\\|\\.\\)")
+	     cs))
+
+(cond
+ ((featurep 'mule)
+  (cond ((boundp 'MULE)
+	 (define-service-coding-system gnus-nntp-service nil *noconv*)
+	 (if (and (boundp 'nntp-server-process)
+		  (processp nntp-server-process)
+		  )
+	     (set-process-coding-system nntp-server-process *noconv* *noconv*)
+	   )
+	 )
+	(running-xemacs-20
+	 (if (and (boundp 'nntp-server-process)
+		  (processp nntp-server-process)
+		  )
+	     (set-process-input-coding-system nntp-server-process 'noconv)
+	   )
+	 ))
+  (call-after-loaded
+   'nnheader
+   (lambda ()
+     (defun nnheader-find-file-noselect (filename &optional nowarn rawfile)
+       (let ((file-coding-system-for-read *noconv*))
+	 (find-file-noselect filename nowarn rawfile)
+	 ))
+     (defun nnheader-insert-raw-file-contents
+       (filename &optional visit beg end replace)
+       (let ((file-coding-system-for-read *noconv*))
+	 (insert-file-contents filename visit beg end replace)
+	 ))
+     ;;(fset 'nnheader-raw-write-region 'si:write-region)
+     ))
+  (defun tm-gnus/prepare-save-mail-function ()
+    (setq file-coding-system *noconv*)
     )
+  (add-hook 'nnmail-prepare-save-mail-hook
+	    'tm-gnus/prepare-save-mail-function)
+  
+  (gnus-set-newsgroup-default-coding-system "alt.chinese.text"      *hz*)
+  (gnus-set-newsgroup-default-coding-system "alt.chinese.text.big5" *big5*)
+  (gnus-set-newsgroup-default-coding-system "han"    *euc-kr*)
+  (and (boundp '*koi8*)
+       (gnus-set-newsgroup-default-coding-system "relcom" *koi8*))
+  ))
 
-(defun gnus-article-hide-headers-if-wanted ()
-  (if (not gnus-show-mime)
-      (tm::gnus-article-hide-headers-if-wanted)
-    ))
+
+;;; @ summary filter
+;;;
+
+(defun tm-gnus/decode-summary-from-and-subjects ()
+  (let ((rest gnus-newsgroup-default-coding-system-alist)
+	cell)
+    (catch 'tag
+      (while (setq cell (car rest))
+	(if (string-match (car cell) gnus-newsgroup-name)
+	    (throw 'tag
+		   (progn
+		     (make-local-variable 'mime/default-coding-system)
+		     (setq mime/default-coding-system (cdr cell))
+		     )))
+	(setq rest (cdr rest))
+	)))
+  (mapcar
+   (lambda (header)
+     (let ((from (or (mail-header-from header) ""))
+	   (subj (or (mail-header-subject header) ""))
+	   (method (car gnus-current-select-method))
+	   )
+       (if (eq method 'nntp)
+	   (progn
+	     (setq from
+		   (character-decode-string from mime/default-coding-system))
+	     (setq subj
+		   (character-decode-string subj mime/default-coding-system))
+	     ))
+       (mail-header-set-from
+	header (mime-eword/decode-string from))
+       (mail-header-set-subject
+	header (mime-eword/decode-string subj))
+       ))
+   gnus-newsgroup-headers))
+     
+(or (boundp 'nnheader-encoded-words-decoding)
+    (add-hook 'gnus-select-group-hook
+	      'tm-gnus/decode-summary-from-and-subjects)
+    )
 
 
 ;;; @ for BBDB
 ;;;
 
+(call-after-loaded
+ 'bbdb
+ (lambda ()
+   (require 'tm-bbdb)
+   ))
+
+(autoload 'tm-bbdb/update-record "tm-bbdb")
+
 (defun tm-gnus/bbdb-setup ()
   (if (memq 'bbdb/gnus-update-record gnus-article-prepare-hook)
       (progn
 	(remove-hook 'gnus-article-prepare-hook 'bbdb/gnus-update-record)
-	(add-hook 'tm-gnus/article-prepare-hook 'bbdb/gnus-update-record)
+	(add-hook 'gnus-article-display-hook 'tm-bbdb/update-record)
 	)))
 
 (add-hook 'gnus-startup-hook 'tm-gnus/bbdb-setup t)
@@ -201,3 +331,5 @@ This variable is set to `gnus-show-mime'.")
 ;;;
 
 (provide 'tm-sgnus)
+
+;;; tm-sgnus.el ends here