tm 7.69.

diff --git a/ChangeLog b/ChangeLog
index fc11afb..ebda76d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Thu Jun 27 15:49:37 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.31 was released.
+       * MEL: Version 5.6 was released.
+       * tm: Version 7.69 was released.
+       * tm/mh-e: Version 7.63.1 was released.
+       * tm/gnus: Version 7.72 was released.
+
+       * inst-tm (compile-tm): condition was modified about XEmacs.
+
+       * inst-tm (compile-tm): Don't `make gnus5' for XEmacs 19.14 or
+       later.
+
+       * inst-tm (compile-tm): `make sgnus' is renamed to `make gnus5'.
+
+Thu Jun 27 14:26:56 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-pgp.el (mime-article/view-application/pgp): Use macro
+       `as-binary-process'.
+
+Thu Jun 27 14:22:59 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor/encrypt-pgp-kazu): Use macro
+       `as-binary-process'.
+       (mime-editor/sign-pgp-kazu): Use macro `as-binary-process'.
+
+Wed Jun 26 15:32:13 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-def.el (mime/charset-coding-system-alist): add `GB2312'.
+
+Tue Jun 25 01:02:40 1996  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * mime-setup.el.in (mu-cite/pre-cite-hook): Add function
+       `mime/decode-message-header'.
+
+Wed Jun 12 23:46:24 1996  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * tm-vm.el: Setting for `mime-editor/split-message-sender-alist'
+       was moved from tm-edit.el.
+
+\f
 Wed Jun 12 05:53:26 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.30 was released.

diff --git a/Makefile b/Makefile
index dc46e7d..0e29fbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.68.tar.gz
+TARFILE = tm7.69.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm

diff --git a/gnus/ChangeLog b/gnus/ChangeLog
index 55adfe4..02161e3 100644 (file)
--- a/gnus/ChangeLog
+++ b/gnus/ChangeLog
@@ -1,3 +1,35 @@
+Thu Jun 27 15:19:48 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/gnus: Version 7.72 was released.
+
+Thu Jun 27 15:09:12 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * Makefile: gnus5o was abolished,
+
+Thu Jun 27 15:01:37 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mk-tgnus (install-tm-gnus): New condition.
+
+       * mk-tgnus: tm-sgnus.el was renamed to tm-gnus5.el.
+
+Thu Jun 27 14:51:12 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * Makefile: gnus5 was renamed to gnus5o.
+       sgnus was renamed to gnus5.
+       g5-path was renamed to g5o-path.
+       s-path was renamed to g5-path.
+
+Thu Jun 27 14:43:48 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-gnus.el, tm-gnus5.el: tm-sgnus.el was renamed to tm-gnus5.el.
+
+       * tm-sgnus.el (tm-gnus/version): modified.
+
+Thu Jun 27 13:46:21 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-sgnus.el: Set *big5* as default-coding-system for tw.
+
+\f
 Mon Jun 10 01:56:02 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/gnus: Version 7.69 was released.

diff --git a/gnus/Makefile b/gnus/Makefile
index d69bcc3..0a18c07 100644 (file)
--- a/gnus/Makefile
+++ b/gnus/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 7.5 1996/03/04 09:29:33 morioka Exp morioka $
+# $Id: Makefile,v 7.8 1996/06/27 15:19:48 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -30,7 +30,7 @@ FILES = tm/gnus/Makefile tm/gnus/*-path tm/gnus/mk-tgnus \
                tm/gnus/*.el tm/gnus/ChangeLog tm/doc/tm-gnus*.texi 
 
 
-TARFILE = tm-gnus7.69.tar
+TARFILE = tm-gnus7.72.tar
 
 
 gnus:
@@ -45,9 +45,6 @@ gnus4:
 gnus5:
        $(EMACS) $(FLAGS) -l g5-path -f compile-tm-gnus
 
-sgnus:
-       $(EMACS) $(FLAGS) -l s-path -f compile-tm-gnus
-
 install-18:
        $(EMACS) $(FLAGS) -f install-tm-gnus $(TMDIR18)
 

diff --git a/gnus/g5-path b/gnus/g5-path
index 89ac1ec..b3bdd29 100644 (file)
--- a/gnus/g5-path
+++ b/gnus/g5-path
@@ -8,8 +8,14 @@
 
 ;; please edit
 
+;; It is for latest Gnus.
+(let ((path (get-latest-path "gnus-5")))
+  (if path
+      (add-path (expand-file-name "lisp/" path))
+    ))
+
 ;; It is relative style. Added path is searched from load-path.
-(add-path "gnus-5.0.15/lisp" 'all-paths)
+;; (add-path "gnus-5.2.10/lisp/" 'all-paths)
 
 ;; It is absolute style.
-;; (add-path "/usr/local/share/emacs/site-lisp/gnus/lisp/")
+;; (add-path "/usr/local/share/emacs/site-lisp/gnus-5.2.10/lisp/")

diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus
index 9a8cac7..67150cc 100644 (file)
--- a/gnus/mk-tgnus
+++ b/gnus/mk-tgnus
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: mk-tgnus,v 3.0 1996/05/07 17:38:25 morioka Exp $
+;;; $Id: mk-tgnus,v 5.0 1996/06/27 15:01:37 morioka Exp $
 ;;;
 
 (setq load-path
@@ -23,7 +23,7 @@
   (princ (format "%s\n" gnus-version))
   (cond ((boundp 'gnus-original-article-buffer)
         (require 'tm-gnus)
-        (byte-compile-file "tm-sgnus.el")
+        (byte-compile-file "tm-gnus5.el")
         )
        ((string-match "Gnus v5\\|September Gnus" gnus-version)
         (require 'tm-gnus)
@@ -87,26 +87,35 @@
                              ;;"tm-gnus.elc"
                              "tm-gnus3.elc" "tm-gnus4.elc")
           )
-         ((or (and running-emacs-19
-                   (<= emacs-minor-version 29))
-              (and running-xemacs-19
-                   (<= emacs-minor-version 13))
-              )
+         ((and running-emacs-19 (<= emacs-minor-version 29))
+          (install-el-files path
+                            "tm-gnus.el" "tm-gnus4.el" "tm-gd3.el")
+          (install-elc-files path
+                             ;;"tm-gnus.elc"
+                             "tm-gnus4.elc")
+          )
+         ((and running-xemacs-19 (<= emacs-minor-version 13))
           (install-el-files path
                             "tm-gnus.el"
-                            "tm-sgnus.el" "tm-gnus4.el"
+                            "tm-gnus5.el" "tm-gnus4.el"
                             "tm-gd3.el")
           (install-elc-files path
                              ;;"tm-gnus.elc"
-                             "tm-sgnus.elc" "tm-gnus4.elc")
+                             "tm-gnus5.elc" "tm-gnus4.elc")
           )
-         (t
+         ((and running-emacs-19 (<= emacs-minor-version 31))
           (install-el-files path
                             "tm-gnus.el"
-                            "tm-sgnus.el" "tm-gnus4.el")
+                            "tm-gnus5.el" "tm-gnus4.el")
+          (install-elc-files path
+                             ;;"tm-gnus.elc"
+                             "tm-gnus5.elc" "tm-gnus4.elc")
+          )
+         (t
+          (install-el-files path "tm-gnus.el" "tm-gnus5.el")
           (install-elc-files path
                              ;;"tm-gnus.elc"
-                             "tm-sgnus.elc" "tm-gnus4.elc")
+                             "tm-gnus5.elc")
           ))
     (setq command-line-args-left (cdr command-line-args-left))
     ))

diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el
index 42915ef..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.21 1996/06/06 16:42:20 shuhei-k 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,8 +43,8 @@
 ;;;
 
 (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)

diff --git a/gnus/tm-gnus5.el b/gnus/tm-gnus5.el
index 25b1443..c0c28d0 100644 (file)
--- 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.9 1995/11/15 10:41:02 morioka Exp $")
+  "$Id: tm-gnus5.el,v 7.72 1996/06/27 14:35:40 morioka Exp $")
 
 (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,226 +85,307 @@ 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 "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)
-  (gnus-article-mode)
-  (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)
+    )
+  (setq tm-gnus/automatic-mime-preview t)
   (run-hooks 'tm-gnus/article-prepare-hook)
   )
 
-(or (fboundp 'tm::gnus-article-setup-buffer)
-    (fset 'tm::gnus-article-setup-buffer
-         (symbol-function 'gnus-article-setup-buffer)
-         ))
-
-(defun gnus-article-setup-buffer ()
-  "Initialize article mode buffer."
-  ;; Returns the article buffer.
-  (if (get-buffer gnus-article-buffer)
-      (save-excursion
-       (set-buffer gnus-article-buffer)
-       (buffer-disable-undo (current-buffer))
-       (setq buffer-read-only t)
-       (gnus-add-current-to-buffer-list)
-       (or (eq major-mode 'gnus-article-mode)
-           (eq major-mode 'mime/viewer-mode)
-           (gnus-article-mode))
-       (current-buffer))
-    (save-excursion
-      (set-buffer (get-buffer-create gnus-article-buffer))
-      (gnus-add-current-to-buffer-list)
-      (gnus-article-mode)
-      (current-buffer)
-      )))
-
 (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 ()
-  (or (and gnus-show-mime
-          (or (not gnus-strict-mime)
-              (gnus-fetch-field "Mime-Version")
-              ))
-      (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)
@@ -306,3 +397,5 @@ This variable is set to `gnus-show-mime'.")
 ;;;
 
 (provide 'tm-gnus5)
+
+;;; tm-gnus5.el ends here

diff --git a/inst-tm b/inst-tm
index d7e30da..6387e40 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.4 1996/06/07 14:14:53 morioka Exp $
+;;; $Id: inst-tm,v 7.7 1996/06/27 15:49:37 morioka Exp $
 ;;;
 
 (load-file "TM-CFG")
@@ -82,28 +82,29 @@
     (set-buffer (get-buffer-create TM_GNUS_COMPILE))
     (let ((emacs (car command-line-args)))
       (insert (format "cd gnus\n%s gnus EMACS=%s PWD=`pwd`\n" MAKE emacs))
-      (cond ((string-match "XEmacs" emacs-version)
-            (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" MAKE emacs))
+      (cond (running-xemacs-19_14-or-later
             )
-           (t (cond ((<= emacs-major-version 18)
+           (running-xemacs
+            (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" MAKE emacs))
+            )
+           (t (cond (running-emacs-18
                      (insert (format "%s gnus3 EMACS=%s PWD=`pwd`\n"
                                      MAKE emacs))
                      (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
                                      MAKE emacs))
                      )
-                    ((< emacs-minor-version 30)
+                    ((<= emacs-minor-version 29)
                      (insert (format "%s gnus4 EMACS=%s PWD=`pwd`\n"
                                      MAKE emacs))
                      (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
                                      MAKE emacs))
                      )
                     (t
-                     (insert (format "%s sgnus EMACS=%s PWD=`pwd`\n" 
+                     (insert (format "%s gnus5 EMACS=%s PWD=`pwd`\n" 
                                      MAKE emacs))
                      )))))
     (write-file TM_GNUS_COMPILE)
-    )
-  )
+    ))
 
 (defun install-el-file (src dest file)
   (let ((src-file (expand-file-name file src)))

diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog
index 8841918..c5fb215 100644 (file)
--- a/mh-e/ChangeLog
+++ b/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 27 15:39:16 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/mh-e: Version 7.63.1 was released.
+
+       * tmh-els: Version check code was fixed.
+
 Wed Jun  5 02:34:06 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tmh-comp.el: version check code was fixed for Emacs

diff --git a/mh-e/Makefile b/mh-e/Makefile
index 07e18e1..585fc71 100644 (file)
--- a/mh-e/Makefile
+++ b/mh-e/Makefile
@@ -24,7 +24,7 @@ TMDIR19       = $(HOME)/lib/emacs19/lisp
 
 
 FILES  = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
-TARFILE = tm-mh-e7.63.tar
+TARFILE = tm-mh-e7.63.1.tar
 
 
 elc:

diff --git a/mh-e/tmh-els b/mh-e/tmh-els
index 4aa438e..025b5e6 100644 (file)
--- a/mh-e/tmh-els
+++ b/mh-e/tmh-els
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: tmh-els,v 1.1 1996/03/04 09:21:19 morioka Exp $
+;;; $Id: tmh-els,v 2.0 1996/06/27 15:39:16 morioka Exp $
 ;;;
 
 (require 'mh-e)
@@ -8,7 +8,7 @@
 (setq tm-mh-e-modules
       (append
        '("tm-mh-e" "tmh-comp")
-       (if (not (boundp 'mh-e-version))
+       (if (not (featurep 'mh-utils))
           '("tm-mh-e3")
         )
        ))

diff --git a/mime-setup.el.in b/mime-setup.el.in
index cc6cc8f..9165ab9 100644 (file)
--- a/mime-setup.el.in
+++ b/mime-setup.el.in
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: mime-setup.el.in,v 7.20 1996/04/16 12:42:35 morioka Exp $
+;;;    $Id: mime-setup.el.in,v 7.21 1996/06/25 01:02:40 shuhei-k Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -89,6 +89,12 @@
   )
 
 
+;;; @ for mu-cite
+;;;
+
+(add-hook 'mu-cite/pre-cite-hook 'mime/decode-message-header)
+
+
 ;;; @ for RMAIL and VM
 ;;;
 

diff --git a/tm-def.el b/tm-def.el
index 70265ac..18d19b1 100644 (file)
--- a/tm-def.el
+++ b/tm-def.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-def.el,v 7.45 1996/05/31 17:52:07 morioka Exp $
+;;;    $Id: tm-def.el,v 7.46 1996/06/26 15:32:13 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, definition
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -204,6 +204,7 @@
           '(("ISO-2022-JP"     . junet)
             ("ISO-2022-KR"     . iso-2022-kr)
             ("EUC-KR"          . euc-kr)
+            ("GB2312"          . euc-china)
             ("ISO-8859-1"      . ctext)
             ("ISO-8859-2"      . iso-8859-2)
             ("ISO-8859-3"      . iso-8859-3)

diff --git a/tm-edit.el b/tm-edit.el
index 06338da..86cc55a 100644 (file)
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -8,7 +8,7 @@
 ;;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/08/21 renamed from mime.el
-;;; Version: $Revision: 7.68 $
+;;; Version: $Revision: 7.69 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.68 1996/06/12 05:53:26 morioka Exp $")
+  "$Id: tm-edit.el,v 7.69 1996/06/27 14:22:59 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -1700,13 +1700,7 @@ Content-Transfer-Encoding: 7bit
            (insert (format "Content-Transfer-Encoding: %s\n" encoding))
          )
        (insert "\n")
-       (or (let ((program-coding-system-alist
-                  (cons (cons (cons nil ".*pgp.*")
-                              (cons *noconv* *noconv*))
-                        program-coding-system-alist))
-                 )
-             (mc-pgp-sign-region beg (point-max))
-             )
+       (or (as-binary-process (mc-pgp-sign-region beg (point-max)))
            (throw 'mime-editor/error 'pgp-error)
            )
        (goto-char beg)
@@ -1753,15 +1747,11 @@ Content-Transfer-Encoding: 7bit
              (insert (format "Content-Transfer-Encoding: %s\n" encoding))
            )
          (insert "\n")
-         (or (let ((program-coding-system-alist
-                    (cons (cons (cons nil ".*pgp.*")
-                                (cons *noconv* *noconv*))
-                          program-coding-system-alist))
-                   )
-               (mc-pgp-encrypt-region
-                (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients)
-                beg (point-max))
-               )
+         (or (as-binary-process
+              (mc-pgp-encrypt-region
+               (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients)
+               beg (point-max))
+              )
              (throw 'mime-editor/error 'pgp-error)
              )
          (goto-char beg)

diff --git a/tm-pgp.el b/tm-pgp.el
index 6ebbd72..6cc7378 100644 (file)
--- a/tm-pgp.el
+++ b/tm-pgp.el
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/7
 ;;; Version:
-;;;    $Id: tm-pgp.el,v 7.15 1996/05/27 08:16:38 morioka Exp $
+;;;    $Id: tm-pgp.el,v 7.16 1996/06/27 14:26:56 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, PGP, security
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -89,13 +89,7 @@
             (goto-char (point-min))
             (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
             )
-          (let ((program-coding-system-alist
-                 (if (boundp 'program-coding-system-alist)
-                     (cons '((nil . ".*pgp.*") *noconv* . *noconv*)
-                           program-coding-system-alist))
-                 ))
-            (mc-decrypt)
-            )
+          (as-binary-process (mc-decrypt))
           (goto-char (point-min))
           (delete-region (point-min)
                          (and

diff --git a/tm-vm.el b/tm-vm.el
index 98fa148..361d481 100644 (file)
--- a/tm-vm.el
+++ b/tm-vm.el
@@ -16,7 +16,7 @@
 ;;;             Rob Kooper <kooper@cc.gatech.edu>
 ;;; Maintainer: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;; Created: 1994/10/29
-;;; Version: $Revision: 7.53 $
+;;; Version: $Revision: 7.54 $
 ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -45,7 +45,7 @@
 (require 'vm)
 
 (defconst tm-vm/RCS-ID
-  "$Id: tm-vm.el,v 7.53 1996/05/23 16:51:04 shuhei-k Exp $")
+  "$Id: tm-vm.el,v 7.54 1996/06/12 23:46:24 shuhei-k Exp $")
 (defconst tm-vm/version (get-version-string tm-vm/RCS-ID))
 
 (define-key vm-mode-map "Z" 'tm-vm/view-message)
@@ -1021,6 +1021,12 @@ only marked messages will be put into the digest."
     (autoload 'tm-mail/insert-message "tm-mail")
     (set-alist 'mime-editor/message-inserter-alist
               'mail-mode (function tm-mail/insert-message))
+    (set-alist 'mime-editor/split-message-sender-alist
+               'mail-mode (function
+                           (lambda ()
+                             (interactive)
+                             (sendmail-send-it)
+                             )))
     (if (and (string-match "XEmacs\\|Lucid" emacs-version)
             tm-vm/use-xemacs-popup-menu)
        (add-hook 'vm-mail-mode-hook 'mime-editor/attach-to-vm-mode-menu)