From ac40a27aee738c377457768c3f0cc3d09b72e5e3 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 15:14:35 +0000 Subject: [PATCH] tm 7.41.2. --- ChangeLog | 30 ++++++++++++++++++++++++++++++ Makefile | 2 +- gnus/ChangeLog | 29 +++++++++++++++++++++++++++++ gnus/Makefile | 2 +- gnus/mk-tgnus | 1 + gnus/tm-gd5.el | 49 +++++++++++++++++++++++++++++++++++++++++++------ gnus/tm-gnus.el | 34 +++++++++++++++++++++++++++++++++- gnus/tm-sgnus.el | 16 +++++++++++++--- tm-bbdb.el | 23 ++++++++++++++++++----- tm-def.el | 8 +++++++- tm-mule.el | 6 ++---- tm-pgp.el | 8 ++++---- tm-view.el | 12 ++++++------ 13 files changed, 188 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47f26a0..a09855c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Thu Jan 25 03:24:35 1996 Morioka Tomohiko + + * tl: Version 7.10 was released. + * tm: Version 7.41.2 was released. + * tm/gnus: Version 7.37 was released. + + * tm-view.el (mime-viewer/ignored-field-list): default value was + changed. + + * tm-view.el (mime-viewer/visible-field-regexp): default value was + changed. + +Thu Jan 25 02:32:26 1996 Morioka Tomohiko + + * tm-mule.el: Definition of variable `mime/default-coding-system' + was moved to tm-def.el. + + * tm-def.el (mime/default-coding-system): not only define for MULE + +Wed Jan 24 02:20:25 1996 Morioka Tomohiko + + * tm-bbdb.el (tm-bbdb/use-mail-extr): new variable + +Tue Jan 23 13:00:44 1996 Morioka Tomohiko + + * tm-pgp.el (mime-article/view-application/pgp): + fixed about character code + conversion. + + Tue Jan 23 05:38:46 1996 Morioka Tomohiko * tm: Version 7.41.1 was released. diff --git a/Makefile b/Makefile index e7e254f..1c595c3 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.41.1.tar.gz +TARFILE = tm7.41.2.tar.gz 18: diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 2c04f28..f9fd4c0 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,32 @@ +Thu Jan 25 03:21:50 1996 Morioka Tomohiko + + * tm/gnus: Version 7.37 was released. + +Thu Jan 25 02:41:11 1996 Morioka Tomohiko + + * Self code conversion for MULE was supported for Gnus 5.[01] and + September Gnus. + + * tm-gnus.el (tm-gnus/maybe-code-convert): new function to convert + character code for Gnus 5.[01] + + * tm-sgnus.el: Code conversion parts were moved from tm-gd5.el. + + * tm-gd5.el: Code conversion parts were moved from tm-sgnus.el. + + * tm-gd5.el: (tm-gnus/decode-summary-from-and-subjects): convert + code in Subject field + +Wed Jan 24 14:22:36 1996 Morioka Tomohiko + + * tm-sgnus.el: self code conversion for MULE + +Tue Jan 23 14:08:38 1996 Morioka Tomohiko + + * tm-gnus.el: redefine function `gnus-article-delete-headers' for + GNUS 3.15 .. 4.1.* + + Tue Jan 23 04:57:53 1996 Morioka Tomohiko * tm/gnus: Version 7.34 was released. diff --git a/gnus/Makefile b/gnus/Makefile index 1bc540c..8de3076 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -28,7 +28,7 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.34.tar +TARFILE = tm-gnus7.37.tar gnus: diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus index 567feb2..387a22b 100644 --- a/gnus/mk-tgnus +++ b/gnus/mk-tgnus @@ -16,6 +16,7 @@ (defun compile-tm-gnus () (load "gnus.el") + (require 'nntp) (require 'tm-view) (require 'tm-partial) (require 'tm-edit) diff --git a/gnus/tm-gd5.el b/gnus/tm-gd5.el index ef1f9f6..773b23b 100644 --- a/gnus/tm-gd5.el +++ b/gnus/tm-gd5.el @@ -1,14 +1,14 @@ ;;; -;;; tm-gd5.el --- tm-gnus module for Gnus 5.*. +;;; tm-gd5.el --- tm-gnus shared module for Gnus 5.*. ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; Copyright (C) 1995,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/11/19 ;;; Version: -;;; $Id: tm-gd5.el,v 2.0 1995/11/21 02:51:08 morioka Exp $ +;;; $Id: tm-gd5.el,v 4.0 1996/01/25 02:37:43 morioka Exp $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -26,6 +26,8 @@ ;;; 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: (cond ((not (boundp 'nnheader-encoded-words-decoding)) (require 'tm-ew-d) @@ -43,18 +45,53 @@ (mail-header-set-subject header (if subj - (mime-eword/decode-string subj) + (mime-eword/decode-string + (code-convert-string + subj mime/default-coding-system *internal*)) "")) )) - gnus-newsgroup-headers) - ) + gnus-newsgroup-headers)) (add-hook 'gnus-select-group-hook (function tm-gnus/decode-summary-from-and-subjects)) )) +(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) + )) + )) + +(fset 'tm-gnus/code-convert-region-to-emacs + (symbol-function 'mime/code-convert-region-to-emacs)) + +(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/decode-message-header) + ) + + ;;; @ end ;;; (provide 'tm-gd5) + +;;; tm-gd5.el ends here diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el index b8443a9..831577f 100644 --- a/gnus/tm-gnus.el +++ b/gnus/tm-gnus.el @@ -9,7 +9,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/20 (obsolete mol's gnus-mime.el) ;;; Version: -;;; $Id: tm-gnus.el,v 7.14 1996/01/20 02:23:40 morioka Exp $ +;;; $Id: tm-gnus.el,v 7.16 1996/01/25 02:41:11 morioka Exp $ ;;; Keywords: news, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -52,6 +52,29 @@ ;; 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) ) ((fboundp 'gnus-article-prepare) ;; for GNUS 3.15 .. 4.* @@ -61,6 +84,15 @@ (fset 'gnus-article-set-mode-line (function tm-gnus/article-set-mode-line)) + (or (fboundp 'tm:gnus-article-delete-headers) + (fset 'tm:gnus-article-delete-headers + (symbol-function 'gnus-article-delete-headers)) + ) + (defun gnus-article-delete-headers () + (or tm-gnus/automatic-mime-preview + (tm:gnus-article-delete-headers) + )) + (require 'gnuspost) (or (fboundp 'tm-gnus/original-news-reply) (fset 'tm-gnus/original-news-reply diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index fae6e87..ff14c17 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -2,13 +2,13 @@ ;;; tm-sgnus.el --- tm-gnus module for September Gnus ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; Copyright (C) 1995,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; MURATA Masahiro ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.34 $ +;;; Version: $Revision: 7.37 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -43,7 +43,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.34 1996/01/23 04:57:53 morioka Exp $") + "$Id: tm-sgnus.el,v 7.37 1996/01/25 03:21:50 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -111,6 +111,14 @@ This variable is set to `gnus-show-mime'.") ;;; @ for tm-view ;;; +(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 tm-gnus/code-convert-region-to-emacs)) + (defun mime-viewer/quitting-method-for-sgnus () (if (not gnus-show-mime) (mime-viewer/kill-buffer)) @@ -179,6 +187,8 @@ 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) (mime/decode-message-header) (run-hooks 'tm-gnus/article-prepare-hook) ) diff --git a/tm-bbdb.el b/tm-bbdb.el index d417606..b208d28 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -1,11 +1,11 @@ ;;; -;;; tm-bbdb.el --- tm shred module for BBDB +;;; tm-bbdb.el --- tm shared module for BBDB ;;; ;;; Copyright (C) 1995 KOBAYASHI Shuhei ;;; ;;; Author: KOBAYASHI Shuhei ;;; Maintainer: MORIOKA Tomohiko -;;; Version: $Id: tm-bbdb.el,v 2.0 1996/01/23 04:34:12 morioka Exp $ +;;; Version: $Id: tm-bbdb.el,v 3.0 1996/01/24 02:20:25 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB ;;; ;;; This file is part of tm (Tools for MIME). @@ -30,6 +30,12 @@ (require 'tl-822) (require 'tm-ew-d) + +;;; @ mail-extr +;;; + +(defvar tm-bbdb/use-mail-extr t) + (defun tm-bbdb/extract-address-components (str) (let* ((ret (rfc822/extract-address-components str)) (phrase (car ret)) @@ -41,9 +47,16 @@ (cons phrase address) )) -(fset 'mail-extract-address-components - (symbol-function 'tm-bbdb/extract-address-components)) -(provide 'mail-extr) +(or tm-bbdb/use-mail-extr + (progn + (fset 'mail-extract-address-components + (symbol-function 'tm-bbdb/extract-address-components)) + (provide 'mail-extr) + )) + + +;;; @ bbdb-extract-field-value +;;; (or (fboundp 'tm:bbdb-extract-field-value) (progn diff --git a/tm-def.el b/tm-def.el index 26fcd6d..821ca71 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.12 1996/01/12 13:59:13 morioka Exp $ +;;; $Id: tm-def.el,v 7.13 1996/01/25 02:31:19 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). @@ -100,6 +100,12 @@ )) +;;; @ coding-system +;;; + +(defvar mime/default-coding-system *ctext*) + + ;;; @ button ;;; diff --git a/tm-mule.el b/tm-mule.el index 0bd2cee..2272b08 100644 --- a/tm-mule.el +++ b/tm-mule.el @@ -2,11 +2,11 @@ ;;; tm-mule.el --- tm definitions depended on Mule ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994,1995,1996 MORIOKA Tomohiko +;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-mule.el,v 7.6 1996/01/11 05:09:28 morioka Exp $ +;;; $Id: tm-mule.el,v 7.7 1996/01/25 02:32:26 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -34,8 +34,6 @@ ;;; @ coding-system ;;; -(defvar mime/default-coding-system *ctext*) - (defvar mime/charset-coding-system-alist '(("ISO-2022-JP" . *iso-2022-ss2-7*) ("ISO-2022-JP-2" . *iso-2022-ss2-7*) diff --git a/tm-pgp.el b/tm-pgp.el index 0970200..a3ad8bd 100644 --- a/tm-pgp.el +++ b/tm-pgp.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/7 ;;; Version: -;;; $Id: tm-pgp.el,v 7.6 1995/12/23 10:16:40 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.7 1996/01/23 13:00:44 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -53,9 +53,7 @@ (cur-buf (current-buffer)) (new-name (format "%s-%s" (buffer-name) cnum)) (mother mime::article/preview-buffer) - (code-converter - (or (cdr (assq major-mode mime-viewer/code-converter-alist)) - 'mime-viewer/default-code-convert-region)) + (code-converter (function mime-viewer/default-code-convert-region)) str) (setq str (buffer-substring beg end)) (switch-to-buffer new-name) @@ -263,3 +261,5 @@ ;;; (provide 'tm-pgp) + +;;; tm-pgp.el ends here diff --git a/tm-view.el b/tm-view.el index 2043900..4d09531 100644 --- a/tm-view.el +++ b/tm-view.el @@ -2,13 +2,13 @@ ;;; tm-view.el --- interactive MIME viewer for GNU Emacs ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; modified by Steven L. Baur ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.40 $ +;;; Version: $Revision: 7.41 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -44,7 +44,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.40 1996/01/23 05:38:46 morioka Exp $") + "$Id: tm-view.el,v 7.41 1996/01/25 03:24:35 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -120,9 +120,9 @@ (defvar mime-viewer/uuencode-encoding-name-list '("x-uue" "x-uuencode")) (defvar mime-viewer/ignored-field-list - '(".*Received" ".*Path" ".*Id" + '(".*Received" ".*Path" ".*Id" "References" "Replied" "Errors-To" - "Lines" "Sender" "Nntp-Posting-Host" "Xref" + "Lines" "Sender" ".*Host" "Xref" "Content-Type" "Precedence" "X-Face" "Status" "X-VM-.*") "All fields that match this list will be hidden in MIME preview buffer. @@ -134,7 +134,7 @@ Each elements are regexp of field-name. [tm-view.el]") ":")) (defvar mime-viewer/visible-field-list - '("Message-Id") + '("Dnas.*") "All fields that match this list will be displayed in MIME preview buffer. Each elements are regexp of field-name. [tm-view.el]") -- 1.7.10.4