X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=gnus%2Ftm-sgnus.el;h=3c02ef7300c3eb5a6d5879b9d2dbed0592df4482;hb=fe8761fcfaa18799752717f6b39c95304e1e6192;hp=6f3934aa617113a88481106fdb327ce29cd5ec30;hpb=8f0359f4b12bfcedc05fc4d09836f67554bfdc90;p=elisp%2Ftm.git diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 6f3934a..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,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko +;;; and KOBAYASHI Shuhei ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.49 $ +;;; Version: $Revision: 7.69 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +42,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.49 1996/03/04 08:17:44 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")) @@ -113,8 +114,8 @@ This variable is set to `gnus-show-mime'.") (defun tm-gnus/content-header-filter () (goto-char (point-min)) (mime-preview/cut-header) - (tm-gnus/code-convert-region-to-emacs (point-min)(point-max) - mime/default-coding-system) + (mime-charset-decode-region (point-min)(point-max) + mime/default-coding-system) (mime/decode-message-header) ) @@ -122,12 +123,9 @@ This variable is set to `gnus-show-mime'.") 'gnus-original-article-mode (function tm-gnus/content-header-filter)) -(fset 'tm-gnus/code-convert-region-to-emacs - (symbol-function 'mime/code-convert-region-to-emacs)) - (set-alist 'mime-viewer/code-converter-alist 'gnus-original-article-mode - (function tm-gnus/code-convert-region-to-emacs)) + (function mime-charset-decode-region)) (defun mime-viewer/quitting-method-for-sgnus () (if (not gnus-show-mime) @@ -139,16 +137,59 @@ 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)) - (set-alist 'mime-viewer/show-summary-method - '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 @@ -186,7 +227,11 @@ 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)) - (let ((mime-viewer/ignored-field-regexp "^:$")) + (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) ) @@ -197,8 +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 () - (tm-gnus/code-convert-region-to-emacs (point-min)(point-max) - mime/default-coding-system) + (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) ) @@ -206,137 +253,120 @@ This variable is set to `gnus-show-mime'.") (setq gnus-decode-encoded-word-method (function tm-gnus/article-decode-encoded-word)) -(if (boundp 'MULE) - (progn - (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*) - ) - - (or (fboundp 'tm-gnus/original-request-article) - (fset 'tm-gnus/original-request-article - (symbol-function 'gnus-request-article)) - ) - - (defun gnus-request-article (article group &optional buffer) - (let ((file-coding-system-for-read *noconv*)) - (tm-gnus/original-request-article article group buffer) - )) - - (defun tm-gnus/prepare-save-mail-function () - (setq file-coding-system *noconv*) - ) - (add-hook 'nnmbox-prepare-save-mail-hook - 'tm-gnus/prepare-save-mail-function) - (add-hook 'nnbabyl-prepare-save-mail-hook - 'tm-gnus/prepare-save-mail-function) - (add-hook 'nnml-prepare-save-mail-hook - 'tm-gnus/prepare-save-mail-function) - (add-hook 'nnmh-prepare-save-mail-hook - 'tm-gnus/prepare-save-mail-function) - (add-hook 'nnfolder-prepare-save-mail-hook - 'tm-gnus/prepare-save-mail-function) - - (defun tm-gnus/nnheader-find-file-noselect (&rest args) - (let ((file-coding-system-for-read *noconv*)) - (apply (function find-file-noselect) args) - )) - (eval-after-load - "nnheader" - '(fset 'nnheader-find-file-noselect - 'tm-gnus/nnheader-find-file-noselect) - ) - - (defun tm-gnus/nnmail-get-new-mail (&rest args) - (let ((file-coding-system-for-read *noconv*)) - (apply (function tm-gnus/original-nnmail-get-new-mail) args) - )) - (eval-after-load - "nnmail" - '(progn (or (fboundp 'tm-gnus/original-nnmail-get-new-mail) - (fset 'tm-gnus/original-nnmail-get-new-mail - (symbol-function 'nnmail-get-new-mail)) - ) - (fset 'nnmail-get-new-mail 'tm-gnus/nnmail-get-new-mail) - )) - )) - -;;; @ summary filter +;;; @ for MULE ;;; -(cond ((not (boundp 'nnheader-encoded-words-decoding)) - (require 'tm-ew-d) - - (defun tm-gnus/decode-summary-from-and-subjects () - (mapcar - (lambda (header) - (let ((from (or (mail-header-from header) "")) - (subj (or (mail-header-subject header) "")) - (method (car gnus-current-select-method)) +(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) ) - (if (eq method 'nntp) - (progn - (setq from - (code-convert-string - from mime/default-coding-system *internal*)) - (setq subj - (code-convert-string - subj mime/default-coding-system *internal*)) - )) - (mail-header-set-from - header (mime-eword/decode-string from)) - (mail-header-set-subject - header (mime-eword/decode-string subj)) - )) - gnus-newsgroup-headers)) - - (add-hook 'gnus-select-group-hook - (function tm-gnus/decode-summary-from-and-subjects)) - )) + (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*)) + )) -;;; @ for tm-edit +;;; @ summary filter ;;; -(defun tm-gnus/forward-insert-buffer (buffer) - (save-excursion - (save-restriction - (if gnus-signature-before-forwarded-message - (goto-char (point-max)) - (goto-char (point-min)) - (re-search-forward - (concat "^" (regexp-quote mail-header-separator) "$")) - (forward-line 1)) - ;; Narrow to the area we are to insert. - (narrow-to-region (point) (point)) - ;; Insert the separators and the forwarded buffer. - (mime-editor/insert-tag "message" "rfc822") - (insert-buffer-substring buffer) - ;; Delete any invisible text. - (goto-char (point-min)) - (let (beg) - (while (setq beg (next-single-property-change (point) 'invisible)) - (goto-char beg) - (delete-region beg (or (next-single-property-change - (point) 'invisible) - (point-max)))))))) - -(call-after-loaded - 'mime-setup - (lambda () - (cond ((string-match "XEmacs" emacs-version) - (require 'gnus-msg) - (fset 'gnus-forward-insert-buffer 'tm-gnus/forward-insert-buffer) - ) - (t - (eval-after-load - "gnus-msg" - '(fset 'gnus-forward-insert-buffer 'tm-gnus/forward-insert-buffer) +(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