X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Ftm.git;a=blobdiff_plain;f=gnus%2Ftm-gnus5.el;h=78db566720dd105718034b2dd583f377cac28434;hp=2065e8bec620d53b3b5f5f7d289efef66ae14be2;hb=7daeb476bdb289acaea91d4ef3041194b62f65bb;hpb=95847857479f2e557aff29531db213b89b5117bb

diff --git a/gnus/tm-gnus5.el b/gnus/tm-gnus5.el
index 2065e8b..78db566 100644
--- a/gnus/tm-gnus5.el
+++ b/gnus/tm-gnus5.el
@@ -1,38 +1,56 @@
 ;;;
-;;; tm-gnus5.el --- tm-gnus module for Gnus 5.*
+;;; tm-gnus5.el --- MIME extender for Gnus 5.2 or later
 ;;;
 ;;; 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>
+;;;         and KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
+;;; Created: 1995/09/24
+;;; Version: $Revision: 7.72 $
 ;;; 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 'tl-822)
-(require 'gnus)
 (require 'tm-view)
+(require 'gnus)
+
+(eval-when-compile (require 'cl))
 
 
 ;;; @ version
 ;;;
 
 (defconst tm-gnus/RCS-ID
-  "$Id: tm-gnus5.el,v 7.7 1995/10/31 15:24:49 morioka Exp $")
+  "$Id: tm-gnus5.el,v 7.72 1996/06/27 14:35:40 morioka Exp morioka $")
 
 (defconst tm-gnus/version
-  (concat (get-version-string tm-gnus/RCS-ID) " for GNUS 5.0.x"))
+  (concat (get-version-string tm-gnus/RCS-ID) " for Gnus 5.2 or later"))
 
 
 ;;; @ variables
 ;;;
 
-(defvar tm-gnus/original-article-buffer " *Original Article*")
-
 (defvar tm-gnus/automatic-mime-preview t
   "*If non-nil, show MIME processed article.
 This variable is set to `gnus-show-mime'.")
@@ -46,25 +64,17 @@ This variable is set to `gnus-show-mime'.")
 (defun tm-gnus/view-message (arg)
   "MIME decode and play this message."
   (interactive "P")
-  (if (save-excursion
-	(set-buffer gnus-article-buffer)
-	(eq major-mode 'mime/viewer-mode)
-	)
-      (pop-to-buffer gnus-article-buffer t)
-    (let ((gnus-break-pages nil))
-      (gnus-summary-select-article t t)
-      )
-    (pop-to-buffer gnus-article-buffer t)
-    (let (buffer-read-only)
-      (remove-text-properties (point-min) (point-max) '(face nil))
-      (if (get-buffer tm-gnus/original-article-buffer)
-	    (kill-buffer tm-gnus/original-article-buffer)
-	  )
-      (rename-buffer tm-gnus/original-article-buffer)
-      (mime/viewer-mode nil nil nil
-			tm-gnus/original-article-buffer
-			gnus-article-buffer)
+  (let ((gnus-break-pages nil))
+    (gnus-summary-select-article t t)
+    )
+  (pop-to-buffer gnus-original-article-buffer t)
+  (let (buffer-read-only)
+    (if (text-property-any (point-min) (point-max) 'invisible t)
+	(remove-text-properties (point-min) (point-max)
+				gnus-hidden-properties)
       ))
+  (mime/viewer-mode nil nil nil gnus-original-article-buffer
+		    gnus-article-buffer)
   )
 
 (defun tm-gnus/summary-scroll-down ()
@@ -75,191 +85,308 @@ 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 "t" (function tm-gnus/summary-toggle-header))
 (define-key gnus-summary-mode-map
   "\e\r" (function tm-gnus/summary-scroll-down))
+(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-gnus5 ()
-  (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-article-mode
-	      (function mime-viewer/quitting-method-for-gnus5))
-   ))
+(set-alist 'mime-viewer/quitting-method-alist
+	   'gnus-original-article-mode
+	   (function mime-viewer/quitting-method-for-gnus5))
+(set-alist 'mime-viewer/show-summary-method
+	   'gnus-original-article-mode
+	   (function mime-viewer/quitting-method-for-gnus5))
 
 
-;;; @ for tm-partial
+;;; @ for tm-edit
 ;;;
 
+;; suggested by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;	1995/11/08 (c.f. [tm ML:1067])
+(defun tm-gnus/insert-article (&optional message)
+  (interactive)
+  (let ((message-cite-function 'mime-editor/inserted-message-filter)
+        (message-reply-buffer gnus-original-article-buffer)
+	)
+    (message-yank-original nil)
+    ))
+
+;;; modified by Steven L. Baur <steve@miranova.com>
+;;;	1995/12/6 (c.f. [tm-en:209])
+(defun mime-editor/attach-to-news-reply-menu ()
+  "Arrange to attach MIME editor's popup menu to VM's"
+  (if (boundp 'news-reply-menu)
+      (progn
+	(setq news-reply-menu (append news-reply-menu
+				      '("---")
+				      mime-editor/popup-menu-for-xemacs))
+	(remove-hook 'news-setup-hook
+		     'mime-editor/attach-to-news-reply-menu)
+	)))
+
 (call-after-loaded
- 'tm-partial
+ 'tm-edit
  (function
   (lambda ()
-    (set-atype 'mime/content-decoding-condition
-	       '((type . "message/partial")
-		 (method . mime-article/grab-message/partials)
-		 (major-mode . gnus-article-mode)
-		 (summary-buffer-exp . gnus-summary-buffer)
-		 ))
-    
-    (set-alist 'tm-partial/preview-article-method-alist
-	       'gnus-article-mode
-	       (function
-		(lambda ()
-		  (tm-gnus/view-message (gnus-summary-article-number))
-		  )))
+    (set-alist 'mime-editor/message-inserter-alist
+	       'message-mode (function tm-gnus/insert-article))
+    (if (string-match "XEmacs\\|Lucid" emacs-version)
+	(add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu)
+      )
+
+    (set-alist 'mime-editor/split-message-sender-alist
+	       'message-mode
+	       (lambda ()
+		 (interactive)
+		 (let (message-send-hook
+		       message-sent-message-via)
+		   (message-send)
+		   )))
     )))
 
 
-;;; @ summary filter
+;;; @ for tm-partial
 ;;;
 
-(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/partial-preview-function ()
+  (tm-gnus/view-message (gnus-summary-article-number))
+  )
+
+(call-after-loaded
+ 'tm-partial
+ (lambda ()
+   (set-atype 'mime/content-decoding-condition
+	      '((type . "message/partial")
+		(method . mime-article/grab-message/partials)
+		(major-mode . gnus-original-article-mode)
+		(summary-buffer-exp . gnus-summary-buffer)
+		))
+   (set-alist 'tm-partial/preview-article-method-alist
+	      'gnus-original-article-mode
+	      'tm-gnus/partial-preview-function)
+   ))
 
 
 ;;; @ article filter
 ;;;
 
+(defun tm-gnus/article-reset-variable ()
+  (setq tm-gnus/automatic-mime-preview nil)
+  )
+
+(add-hook 'gnus-article-prepare-hook 'tm-gnus/article-reset-variable)
+
 (defun tm-gnus/preview-article ()
-  (if (get-buffer tm-gnus/original-article-buffer)
-      (kill-buffer tm-gnus/original-article-buffer)
-    )
-  (rename-buffer tm-gnus/original-article-buffer)
-  (set-buffer (get-buffer-create gnus-article-buffer))
   (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)
+  (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
+		      gnus-article-mode-map)
+    )
+  (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)
+  )
 
-(defun gnus-article-hide-headers-if-wanted ()
-  (if (not gnus-show-mime)
-      (tm::gnus-article-hide-headers-if-wanted)
-    ))
+(setq gnus-decode-encoded-word-method
+      (function tm-gnus/article-decode-encoded-word))
 
 
-;;; @ for mh-e
+;;; @ for MULE
 ;;;
 
-(call-after-loaded
- 'tm-mh-e
- (function
-  (lambda ()
+(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-file-contents-literally
+       (filename &optional visit beg end replace)
+       (let ((file-coding-system-for-read *noconv*))
+	 (insert-file-contents-literally filename visit beg end replace)
+	 ))
+     ))
+  ;; Please use Gnus 5.2.10 or later if you use Mule.
+  (call-after-loaded
+   'nnmail
+   (lambda ()
+     (defun nnmail-find-file (file)
+       "Insert FILE in server buffer safely. [tm-gnus5.el]"
+       (set-buffer nntp-server-buffer)
+       (erase-buffer)
+       (let ((format-alist nil)
+             (after-insert-file-functions   ; for jam-code-guess
+              (if (memq 'jam-code-guess-after-insert-file-function
+                        after-insert-file-functions)
+                  '(jam-code-guess-after-insert-file-function)))
+	     (file-coding-system-for-read *noconv*))
+	 (condition-case ()
+	     (progn (insert-file-contents file) t)
+	   (file-error nil))))
+     ))
+  (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 "tw"	*big5*)
+  (gnus-set-newsgroup-default-coding-system "han"	*euc-kr*)
+  (and (boundp '*koi8*)
+       (gnus-set-newsgroup-default-coding-system "relcom" *koi8*))
+  ))
+
 
-;;; by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;; @ summary filter
 ;;;
-;; Please use following setting:
-;;
-;;	(autoload 'gnus-mail-forward-using-mhe-mime "tm-mh-e"
-;;	          "Forward using mh-e with tm-edit." t)
-;;	(setq gnus-mail-forward-method
-;;	      (function gnus-mail-forward-using-mhe-mime))
-;;
-(defun gnus-mail-forward-using-mhe-mime (&optional buffer)
-  "Forward the current message to another user using mh-e with mime-mode."
-  ;; First of all, prepare mhe mail buffer.
-  (require 'mh-comp)
-  (require 'tm-edit)
-  (let* ((to (read-string "To: "))
-	 (cc (read-string "Cc: "))
-	 (buffer (save-excursion
-		   (set-buffer gnus-article-buffer)
-		   (if (eq major-mode 'mime/viewer-mode)
-		       mime::preview/article-buffer
-		     (current-buffer)
-		     )))
-	 (config (current-window-configuration)) ; need to add this - erik
-	 (subject (gnus-forward-make-subject buffer)))
-    (setq mh-show-buffer buffer)
-    (mh-find-path)
-    (mh-send-sub to (or cc "")
-		 (or subject "(None)") config) ; Erik Selberg 1/23/94
-    (let ((draft (current-buffer))
-	  (gnus-mail-buffer (current-buffer))
-	  mail-buf)
-      (gnus-configure-windows 'reply-yank)
-      (setq mail-buf (eval (cdr (assq 'mail gnus-window-to-buffer))))
-      (pop-to-buffer mail-buf) ; always in the display, so won't have window probs
-      (switch-to-buffer draft)
-      )
-    (save-excursion
-      (goto-char (point-max))
-      (insert (concat (mime-make-tag "message" "rfc822" nil "7bit") "\n"))
-      (insert-buffer buffer)
-      (setq mh-sent-from-folder buffer)
-      (setq mh-sent-from-msg 1)
-      (setq mh-previous-window-config config)
-      (run-hooks 'gnus-mail-hook)
-      )))
 
-)))
+(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)
@@ -271,3 +398,5 @@ This variable is set to `gnus-show-mime'.")
 ;;;
 
 (provide 'tm-gnus5)
+
+;;; tm-gnus5.el ends here