From: morioka Date: Mon, 9 Mar 1998 17:47:40 +0000 (+0000) Subject: tm 7.56. X-Git-Tag: tm7_56~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a5ffa065614536ca388988f44c80bebcca51a483;p=elisp%2Ftm.git tm 7.56. --- diff --git a/ChangeLog b/ChangeLog index d474214..bec5175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +Mon Apr 29 02:29:21 1996 MORIOKA Tomohiko + + * tl: Version 7.22.1 was released. + * tm: Version 7.56 was released. + * tm/gnus: Version 7.54 was released. + + * tm-edit.el (mime-editor::edit-again): Use function + `decode-coding-region' instead of `code-convert-region'. + + * tm-view.el (mime-viewer/make-preview-buffer): use `make-list' + and `setcar'. + (mime-preview/display-content): renamed from + `mime-viewer/display-content'. + +Sat Apr 27 15:32:23 1996 MORIOKA Tomohiko + + * README.en: typo was fixed. (cf. [tm-ja:1807]) + +Sat Apr 27 15:30:29 1996 MORIOKA Tomohiko + + * tm-def.el (mime/charset-coding-system-alist): initial setting + was modified for XEmacs 20 with Mule. + +Sat Apr 27 13:17:56 1996 MORIOKA Tomohiko + + * tm-pgp.el (mime-article/view-application/pgp): + fixed about code-converting. + + Fri Apr 26 05:31:57 1996 MORIOKA Tomohiko * tl: Version 7.22 was released. diff --git a/Makefile b/Makefile index e811cc7..4a3a93b 100644 --- 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.54.tar.gz +TARFILE = tm7.56.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/README.en b/README.en index d3c3741..74e0727 100644 --- a/README.en +++ b/README.en @@ -1,7 +1,7 @@ [README for tm (English Version)] by MORIOKA Tomohiko and KOBAYASHI Shuhei -$Id: README.en,v 7.17 1996/04/19 17:29:32 morioka Exp $ +$Id: README.en,v 7.18 1996/04/27 15:32:23 morioka Exp $ 1 What's tm? @@ -122,7 +122,7 @@ mmencode. You can specify Emacs command name, for example if you want to use `xemacs' as Emacs command: - % make all EMACS=xemacs + % make install EMACS=xemacs 6 .emacs diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 0fc10f3..dc1c38c 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,13 @@ +Mon Apr 29 01:55:32 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.54 was released. + + * tm-sgnus.el (tm-gnus/article-decode-encoded-word): Use function + `decode-coding-region' instead of `code-convert-region'. + (tm-gnus/decode-summary-from-and-subjects): Use function + `decode-coding-string' instead of `code-convert-string'. + + Thu Apr 25 12:07:08 1996 MORIOKA Tomohiko * tm/gnus: Version 7.53 was released. diff --git a/gnus/Makefile b/gnus/Makefile index a8fda91..bd5a46f 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -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.53.tar +TARFILE = tm-gnus7.54.tar gnus: diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 73cddf5..6b9f47d 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.53 $ +;;; Version: $Revision: 7.54 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.53 1996/04/25 12:07:08 morioka Exp $") + "$Id: tm-sgnus.el,v 7.54 1996/04/29 01:55:32 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -201,11 +201,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 () - (code-convert-region (point-min)(point-max) - (save-excursion - (set-buffer gnus-summary-buffer) - mime/default-coding-system) - *internal*) + (decode-coding-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) ) @@ -338,11 +337,9 @@ This variable is set to `gnus-show-mime'.") (if (eq method 'nntp) (progn (setq from - (code-convert-string - from mime/default-coding-system *internal*)) + (decode-coding-string from mime/default-coding-system)) (setq subj - (code-convert-string - subj mime/default-coding-system *internal*)) + (decode-coding-string subj mime/default-coding-system)) )) (mail-header-set-from header (mime-eword/decode-string from)) diff --git a/tm-def.el b/tm-def.el index 5de868a..d554a8b 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.35 1996/04/25 14:29:51 morioka Exp $ +;;; $Id: tm-def.el,v 7.36 1996/04/27 15:30:29 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, definition ;;; ;;; This file is part of tm (Tools for MIME). @@ -164,44 +164,55 @@ ;;; (defvar mime/charset-coding-system-alist - (foldr (function - (lambda (a cell) - (if (boundp (cdr cell)) - (cons (cons (car cell) (symbol-value (cdr cell))) a) - a))) - nil - '(("ISO-2022-JP" . *junet*) - ("ISO-2022-KR" . *iso-2022-kr*) - ("EUC-KR" . *euc-kr*) - ("ISO-8859-1" . *ctext*) - ("ISO-8859-2" . *iso-8859-2*) - ("ISO-8859-3" . *iso-8859-3*) - ("ISO-8859-4" . *iso-8859-4*) - ("ISO-8859-5" . *iso-8859-5*) - ("KOI8-R" . *koi8*) - ("ISO-8859-7" . *iso-8859-7*) - ("ISO-8859-8" . *iso-8859-8*) - ("ISO-8859-9" . *iso-8859-9*) - ("ISO-2022-JP-2" . *iso-2022-ss2-7*) - ("X-ISO-2022-JP-2" . *iso-2022-ss2-7*) - ("ISO-2022-INT-1" . *iso-2022-int-1*) - ("SHIFT_JIS" . *sjis*) - ("X-SHIFTJIS" . *sjis*) - ("BIG5" . *big5*) - ))) + (let* (csl + (f (if (and running-xemacs-20 (featurep 'mule)) + (progn + (setq csl (coding-system-list)) + (function + (lambda (a cell) + (if (memq (cdr cell) csl) + (cons cell a) + a)))) + (function + (lambda (a cell) + (let ((sym (symbol-concat "*" (cdr cell) "*"))) + (if (boundp sym) + (cons (cons (car cell) (symbol-value sym)) a) + a)))) + ))) + (foldr f nil + '(("ISO-2022-JP" . junet) + ("ISO-2022-KR" . iso-2022-kr) + ("EUC-KR" . euc-kr) + ("ISO-8859-1" . ctext) + ("ISO-8859-2" . iso-8859-2) + ("ISO-8859-3" . iso-8859-3) + ("ISO-8859-4" . iso-8859-4) + ("ISO-8859-5" . iso-8859-5) + ("KOI8-R" . koi8) + ("ISO-8859-7" . iso-8859-7) + ("ISO-8859-8" . iso-8859-8) + ("ISO-8859-9" . iso-8859-9) + ("ISO-2022-JP-2" . iso-2022-ss2-7) + ("X-ISO-2022-JP-2" . iso-2022-ss2-7) + ("ISO-2022-INT-1" . iso-2022-int-1) + ("SHIFT_JIS" . sjis) + ("X-SHIFTJIS" . sjis) + ("BIG5" . big5) + )))) (defvar mime/default-coding-system *ctext*) (defun mime/convert-string-to-emacs (str charset) (let ((cs (assoc charset mime/charset-coding-system-alist))) (if cs - (code-convert-string str (cdr cs) *internal*) + (decode-coding-string str (cdr cs)) ))) (defun mime/convert-string-from-emacs (str charset) (let ((cs (assoc charset mime/charset-coding-system-alist))) (if cs - (code-convert-string str *internal* (cdr cs)) + (encode-coding-string str (cdr cs)) ))) (defun mime/code-convert-region-to-emacs (beg end charset &optional encoding) @@ -210,7 +221,7 @@ (cdr (assoc (upcase charset) mime/charset-coding-system-alist)) mime/default-coding-system))) (if ct - (code-convert-region beg end ct *internal*) + (decode-coding-region beg end ct) ))) (defun mime/code-convert-region-from-emacs (beg end charset &optional encoding) @@ -219,7 +230,7 @@ (cdr (assoc (upcase charset) mime/charset-coding-system-alist)) mime/default-coding-system))) (if ct - (code-convert-region beg end *internal* ct) + (encode-coding-region beg end ct) ))) diff --git a/tm-edit.el b/tm-edit.el index 6bed766..0b85027 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -8,7 +8,7 @@ ;;; MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/08/21 renamed from mime.el -;;; Version: $Revision: 7.52 $ +;;; Version: $Revision: 7.53 $ ;;; 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.52 1996/04/19 13:40:55 shuhei-k Exp $") + "$Id: tm-edit.el,v 7.53 1996/04/29 01:52:53 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -2578,9 +2578,9 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (if charset (mime/code-convert-region-to-emacs (point-min) (point-max) charset) - (code-convert-region + (decode-coding-region (point-min) (point-max) - mime/default-coding-system *internal*) + mime/default-coding-system) )) (and str (setq pstr (concat pstr "\n" str)) @@ -2606,8 +2606,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" )) )))) (if code-conversion - (code-convert-region (point-min) (point-max) - mime/default-coding-system *internal*) + (decode-coding-region (point-min) (point-max) + mime/default-coding-system) ) )))) diff --git a/tm-pgp.el b/tm-pgp.el index 2822539..09a0ec0 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.10 1996/02/03 00:56:20 morioka Exp $ +;;; $Id: tm-pgp.el,v 7.13 1996/04/27 15:11:21 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, PGP, security ;;; ;;; This file is part of tm (Tools for MIME). @@ -53,8 +53,8 @@ (cur-buf (current-buffer)) (new-name (format "%s-%s" (buffer-name) cnum)) (mother mime::article/preview-buffer) - (code-converter (function mime-viewer/default-code-convert-region)) - str) + (mode major-mode) + code-converter str) (setq str (buffer-substring beg end)) (switch-to-buffer new-name) (erase-buffer) @@ -80,17 +80,28 @@ (while (re-search-forward "^- -" nil t) (replace-match "-") ) + (setq code-converter + (or + (cdr (assq mode mime-viewer/code-converter-alist)) + (function mime-viewer/default-code-convert-region))) ) ((progn (goto-char (point-min)) (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t) ) - (mc-decrypt) + (let ((program-coding-system-alist + (if (boundp 'program-coding-system-alist) + (cons '((nil . ".*pgp.*") *noconv* . *noconv*) + program-coding-system-alist)) + )) + (mc-decrypt) + ) (goto-char (point-min)) (delete-region (point-min) (and (search-forward "\n\n") (match-end 0))) + (setq code-converter (function mime/code-convert-region-to-emacs)) )) (setq major-mode 'mime/show-message-mode) (setq mime::article/code-converter code-converter) diff --git a/tm-view.el b/tm-view.el index e70b578..2d7fb1c 100644 --- a/tm-view.el +++ b/tm-view.el @@ -8,7 +8,7 @@ ;;; modified by Steven L. Baur ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.54 $ +;;; Version: $Revision: 7.56 $ ;;; 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.54 1996/04/25 22:43:33 morioka Exp $") + "$Id: tm-view.el,v 7.56 1996/04/29 02:29:21 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -405,41 +405,34 @@ The compressed face will be piped to this command.") ret)) (defun mime-viewer/make-preview-buffer (&optional obuf) - (let ((cinfo mime::article/content-info) - (the-buf (current-buffer)) - (mode major-mode) - pcl dest) + (let* ((cinfo mime::article/content-info) + (pcl (mime/flatten-content-info cinfo)) + (dest (make-list (length pcl) nil)) + (the-buf (current-buffer)) + (mode major-mode) + ) (or obuf - (setq obuf (concat "*Preview-" (buffer-name the-buf) "*")) - ) - (setq pcl (mime/flatten-content-info cinfo)) - (let ((bf (get-buffer obuf))) - (if bf - (progn - (set-buffer obuf) - (setq buffer-read-only nil) - (erase-buffer) - ) - (setq bf (get-buffer-create obuf)) - (set-buffer obuf) - )) + (setq obuf (concat "*Preview-" (buffer-name the-buf) "*"))) + (set-buffer (get-buffer-create obuf)) + (erase-buffer) (setq mime::preview/article-buffer the-buf) (setq mime::preview/original-major-mode mode) (setq major-mode 'mime/viewer-mode) (setq mode-name "MIME-View") - (while pcl - (setq dest - (cons (mime-viewer/display-content (car pcl) cinfo the-buf obuf) - dest) - pcl (cdr pcl)) - ) + (let ((drest dest)) + (while pcl + (setcar drest + (mime-preview/display-content (car pcl) cinfo the-buf obuf)) + (setq pcl (cdr pcl) + drest (cdr drest)) + )) (set-buffer-modified-p nil) (setq buffer-read-only t) (set-buffer the-buf) - (list obuf (nreverse dest)) + (list obuf dest) )) -(defun mime-viewer/display-content (content cinfo ibuf obuf) +(defun mime-preview/display-content (content cinfo ibuf obuf) (let* ((beg (mime::content-info/point-min content)) (end (mime::content-info/point-max content)) (ctype (mime::content-info/type content))