This commit was generated by cvs2svn to compensate for changes in r422,

[elisp/tm.git] / gnus / tm-gnus.el

diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el
index 831577f..34a0891 100644 (file)
--- a/gnus/tm-gnus.el
+++ b/gnus/tm-gnus.el
@@ -9,7 +9,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1993/11/20 (obsolete mol's gnus-mime.el)
 ;;; Version:
-;;;    $Id: tm-gnus.el,v 7.16 1996/01/25 02:41:11 morioka Exp $
+;;;    $Id: tm-gnus.el,v 7.22 1996/06/27 14:43:48 morioka Exp $
 ;;; Keywords: news, MIME, multimedia, encoded-word, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -43,38 +43,36 @@
 ;;;
 
 (cond ((boundp 'gnus-original-article-buffer)
-       ;; for September Gnus and Gnus 5.2 ..
-       (require 'tm-sgnus)
+       ;; for Gnus 5.2 or later
+       (require 'tm-gnus5)
        )
       ((or (string-match
            "^\\((ding) Gnus\\|Gnus v5\\|September Gnus\\)" gnus-version)
           (fboundp 'mail-header-from))
        ;; for Gnus 5.0 .. 5.1.*
-       (require 'tm-gd5)
        (require 'tm-gnus4)
-
-       (set-alist 'mime-viewer/content-header-filter-alist
-                 'gnus-article-mode
-                 (function tm-gnus/content-header-filter))
-       (set-alist 'mime-viewer/code-converter-alist
-                 'gnus-article-mode
-                 (function tm-gnus/code-convert-region-to-emacs))
-
-       (defvar tm-gnus/code-converted nil)
-       (defun tm-gnus/maybe-code-convert ()
-        (or tm-gnus/automatic-mime-preview
-            (let ((mid (rfc822/get-field-body "Message-Id")))
-              (or
-               (and tm-gnus/code-converted
-                    (string-equal tm-gnus/code-converted mid))
-               (progn
-                 (tm-gnus/code-convert-region-to-emacs
-                  (point-min)(point-max)
-                  mime/default-coding-system)
-                 (tm-gnus/decode-encoded-word-if-you-need)
-                 (setq tm-gnus/code-converted mid)
-                 )))))
-       (add-hook 'gnus-article-display-hook 'tm-gnus/maybe-code-convert)
+       (cond ((not (boundp 'nnheader-encoded-words-decoding))
+             (require 'tm-ew-d)
+             (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))
+             ))
        )
       ((fboundp 'gnus-article-prepare)
        ;; for GNUS 3.15 .. 4.*
@@ -113,66 +111,6 @@
        ))
 
 
-;;; @ 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 (;; for Emacs 19
-       (mail-citation-hook '(mime-editor/inserted-message-filter))
-       news-reply-header-hook
-       mail-yank-hooks
-       
-       ;; for Emacs 18
-       (mail-yank-ignored-headers mime-editor/yank-ignored-field-regexp)
-       (news-make-reply-yank-header (function
-                                     (lambda (message-id from) "")
-                                     ))
-       (news-yank-original-quoting-indicator "")
-       
-       ;; select raw article buffer
-       (mail-reply-buffer
-        (save-excursion
-          (set-buffer gnus-article-buffer)
-          (if (eq major-mode 'mime/viewer-mode)
-              mime::preview/article-buffer
-            gnus-article-buffer)))
-       )
-    (news-reply-yank-original 0)
-    ))
-
-;;; 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-edit
- (function
-  (lambda ()
-    (set-alist
-     'mime-editor/message-inserter-alist
-     'news-reply-mode (function tm-gnus/insert-article))
-    
-    (autoload 'tm-mail/insert-message "tm-mail")
-    (set-alist 'mime-editor/message-inserter-alist
-              'mail-mode (function tm-mail/insert-message))
-    (if (string-match "XEmacs\\|Lucid" emacs-version)
-       (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu)
-      )
-    )))
-
-
 ;;; @ end
 ;;;