X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=gnus%2Ftm-sgnus.el;h=3c02ef7300c3eb5a6d5879b9d2dbed0592df4482;hb=53ab6c426401d04d0d0ce99d6df144187be6ba01;hp=e7c0dc5cd6279946cc6465a43035a46fc8584fd9;hpb=80f1943d32ac9df38fcdce6a8396e4d64b2a4e13;p=elisp%2Ftm.git diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index e7c0dc5..3c02ef7 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -1,13 +1,14 @@ ;;; -;;; tm-sgnus.el --- tm-gnus module for September GNUS +;;; tm-sgnus.el --- MIME extender for Gnus 5.2 ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; Copyright (C) 1995,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko +;;; and KOBAYASHI Shuhei ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.20 $ +;;; Version: $Revision: 7.69 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -25,20 +26,23 @@ ;;; 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) -(require 'tm-gd5) + +(eval-when-compile (require 'cl)) ;;; @ version ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.20 1995/12/04 00:25:21 morioka Exp $") + "$Id: tm-sgnus.el,v 7.69 1996/06/09 06:57:33 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -81,37 +85,48 @@ This variable is set to `gnus-show-mime'.") (defun tm-gnus/summary-toggle-header (&optional arg) (interactive "P") - (if (and gnus-show-mime - (or (not gnus-strict-mime) - (save-excursion - (set-buffer gnus-article-buffer) - (gnus-fetch-field "Mime-Version") - ))) - (let ((mime-viewer/ignored-field-regexp - (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-regexp - "^:$"))) - (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 () (if (not gnus-show-mime) (mime-viewer/kill-buffer)) @@ -122,18 +137,68 @@ This variable is set to `gnus-show-mime'.") (gnus-summary-select-article nil t) )) +(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-edit +;;; + +;; suggested by OKABE Yasuo +;; 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 +;;; 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-view - (lambda () - (set-alist 'mime-viewer/quitting-method-alist - 'gnus-original-article-mode - (function mime-viewer/quitting-method-for-sgnus)) - )) + 'tm-edit + (function + (lambda () + (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) + ))) + ))) ;;; @ for tm-partial ;;; +(defun tm-gnus/partial-preview-function () + (tm-gnus/view-message (gnus-summary-article-number)) + ) + (call-after-loaded 'tm-partial (lambda () @@ -145,9 +210,7 @@ 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) )) @@ -164,8 +227,14 @@ 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 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) ) @@ -173,6 +242,10 @@ This variable is set to `gnus-show-mime'.") (setq gnus-show-mime-method (function tm-gnus/preview-article)) (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) ) @@ -180,25 +253,138 @@ This variable is set to `gnus-show-mime'.") (setq gnus-decode-encoded-word-method (function tm-gnus/article-decode-encoded-word)) -(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)) + +;;; @ 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-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-sgnus.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 "han" *euc-kr*) + (and (boundp '*koi8*) + (gnus-set-newsgroup-default-coding-system "relcom" *koi8*)) + )) + + +;;; @ summary filter +;;; -(defun gnus-article-hide-headers-if-wanted () - (or tm-gnus/automatic-mime-preview - (tm::gnus-article-hide-headers-if-wanted) - )) +(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) @@ -210,3 +396,5 @@ This variable is set to `gnus-show-mime'.") ;;; (provide 'tm-sgnus) + +;;; tm-sgnus.el ends here