From 8a2d7101c60c0cdadd2aff5461166494c6918f1f Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 10:58:41 +0000 Subject: [PATCH] tm 7.12. --- Changes-7.12.en | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Changes-7.12.ja | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- gnus/Makefile | 2 +- gnus/tm-sgnus.el | 46 ++++++++++++++++++++-------------------- tm-ew-e.el | 18 +++++++++------- tm-eword.el | 14 ++++++++----- tm-view.el | 12 +++++------ 8 files changed, 169 insertions(+), 43 deletions(-) create mode 100644 Changes-7.12.en create mode 100644 Changes-7.12.ja diff --git a/Changes-7.12.en b/Changes-7.12.en new file mode 100644 index 0000000..5364d78 --- /dev/null +++ b/Changes-7.12.en @@ -0,0 +1,61 @@ +* tl + + Attached version 7.01. + +tl/emu-nemacs.el +---------------------------- +revision 7.1 +date: 1995/10/11 11:49:55; author: morioka; state: Exp; lines: +16 -1 +Function `find-charset-string' and function `find-charset-region' were +created. +---------------------------- + +tl/emu-orig.el +---------------------------- +revision 6.0 +date: 1995/10/11 11:50:24; author: morioka; state: Exp; lines: +16 -1 +Function `find-charset-string' and function `find-charset-region' were +created. +---------------------------- + + +* tm + +tm/tm-ew-e.el +---------------------------- +revision 7.1 +date: 1995/10/11 11:56:46; author: morioka; state: Exp; lines: +10 -8 +(1) function `tm-eword::phrase-route-addr-to-rwl' was modified to + delete top linear-white-space. +(2) In function `tm-eword::phrase-to-rwl', treatment of quoted-string + was changed. +---------------------------- + +tm/tm-eword.el +---------------------------- +revision 7.4 +date: 1995/10/11 11:53:17; author: morioka; state: Exp; lines: +9 -5 +(1) In function `mime/encode-message-header', field extraction was + changed. +(2) If a field has only US-ASCII, it is not touched. +---------------------------- + +tm/tm-view.el +---------------------------- +revision 7.12 +date: 1995/10/11 12:12:06; author: morioka; state: Exp; lines: +6 -6 +Function `mime::get-point-content-number' was renamed to +`mime-article/point-content-number'. +---------------------------- + + +tm/gnus + + Attached version 7.02.1. + +tm/gnus/tm-sgnus.el +---------------------------- +revision 7.2 +date: 1995/10/11 10:20:29; author: morioka; state: Exp; lines: +24 -22 +nnheader patch support. +---------------------------- diff --git a/Changes-7.12.ja b/Changes-7.12.ja new file mode 100644 index 0000000..084cf00 --- /dev/null +++ b/Changes-7.12.ja @@ -0,0 +1,57 @@ +* tl + + Version 7.01 を添付した。 + +tl/emu-nemacs.el +---------------------------- +revision 7.1 +date: 1995/10/11 11:49:55; author: morioka; state: Exp; lines: +16 -1 +関数 find-charset-string と関数 find-charset-region を追加した。 +---------------------------- + +tl/emu-orig.el +---------------------------- +revision 6.0 +date: 1995/10/11 11:50:24; author: morioka; state: Exp; lines: +16 -1 +関数 find-charset-string と関数 find-charset-region を追加した。 +---------------------------- + + +* tm + +tm/tm-ew-e.el +---------------------------- +revision 7.1 +date: 1995/10/11 11:56:46; author: morioka; state: Exp; lines: +10 -8 +(1) 関数 tm-eword::phrase-route-addr-to-rwl で先頭の + linear-white-space を取り除くようにした。 +(2) 関数 tm-eword::phrase-to-rwl での quoted-string の取り扱いを変えた。 +---------------------------- + +tm/tm-eword.el +---------------------------- +revision 7.4 +date: 1995/10/11 11:53:17; author: morioka; state: Exp; lines: +9 -5 +(1) 関数 mime/encode-message-header での field の取り方を変えた。 +(2) field に US-ASCII しか含まれていない場合は encode しないようにした。 +---------------------------- + +tm/tm-view.el +---------------------------- +revision 7.12 +date: 1995/10/11 12:12:06; author: morioka; state: Exp; lines: +6 -6 +関数 mime::get-point-content-number を +`mime-article/point-content-number' に改名した。 +---------------------------- + + +tm/gnus + + Version 7.02.1 を添付した。 + +tm/gnus/tm-sgnus.el +---------------------------- +revision 7.2 +date: 1995/10/11 10:20:29; author: morioka; state: Exp; lines: +24 -22 +nnheader patch に対応した。 +---------------------------- diff --git a/Makefile b/Makefile index 1db039d..88edff7 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ TL_FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.11.tar +TARFILE = tm7.12.tar nemacs: diff --git a/gnus/Makefile b/gnus/Makefile index 63a4ba5..f69d772 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -17,7 +17,7 @@ TMDIR19 = $(HOME)/lib/emacs19/lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.02.tar +TARFILE = tm-gnus7.02.1.tar gnus3: diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 655b2c0..aafc58d 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -26,7 +26,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.1 1995/10/05 13:01:17 morioka Exp $") + "$Id: tm-sgnus.el,v 7.2 1995/10/11 10:20:29 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -92,27 +92,29 @@ article is automatic MIME decoded.") ;;; @ summary filter ;;; -(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/decode-encoded-words-string from) - "")) - (mail-header-set-subject - header - (if subj - (mime/decode-encoded-words-string subj) - "")) - )) - gnus-newsgroup-headers) - ) - -(add-hook 'gnus-select-group-hook - (function tm-gnus/decode-summary-from-and-subjects)) +(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/decode-encoded-words-string from) + "")) + (mail-header-set-subject + header + (if subj + (mime/decode-encoded-words-string subj) + "")) + )) + gnus-newsgroup-headers) + ) + + (add-hook 'gnus-select-group-hook + (function tm-gnus/decode-summary-from-and-subjects)) + )) ;;; @ article filter diff --git a/tm-ew-e.el b/tm-ew-e.el index 0150f19..d81e40c 100644 --- a/tm-ew-e.el +++ b/tm-ew-e.el @@ -7,7 +7,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-ew-e.el,v 7.0 1995/10/03 04:35:11 morioka Exp $ +;;; $Id: tm-ew-e.el,v 7.1 1995/10/11 11:56:46 morioka Exp $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; @@ -299,19 +299,18 @@ ;;; (defun tm-eword::phrase-to-rwl (phrase) - (let (token type dest) + (let (token type dest str) (while phrase (setq token (car phrase)) (setq type (car token)) (cond ((eq type 'quoted-string) + (setq str (concat "\"" (cdr token) "\"")) (setq dest (append dest - '(("\"" nil nil)) - (tm-eword::words-to-ruled-words - (tm-eword::lc-words-to-words - (tm-eword::split-to-lc-words (cdr token)))) - '(("\"" nil nil)) - )) + (list + (cons str (mime/find-charset-rule + (find-charset-string str))) + ))) ) ((eq type 'comment) (setq dest @@ -340,6 +339,9 @@ (let ((phrase (nth 1 phrase-route-addr)) (route (nth 2 phrase-route-addr)) dest) + (if (eq (car (car phrase)) 'spaces) + (setq phrase (cdr phrase)) + ) (setq dest (tm-eword::phrase-to-rwl phrase)) (if dest (setq dest (append dest '((" " nil nil)))) diff --git a/tm-eword.el b/tm-eword.el index b1fc9d0..9327b55 100644 --- a/tm-eword.el +++ b/tm-eword.el @@ -24,7 +24,7 @@ ;;; (defconst tm-eword/RCS-ID - "$Id: tm-eword.el,v 7.3 1995/10/06 05:44:48 morioka Exp $") + "$Id: tm-eword.el,v 7.4 1995/10/11 11:53:17 morioka Exp $") (defconst tm-eword/version (get-version-string tm-eword/RCS-ID)) @@ -99,11 +99,15 @@ )) (goto-char (point-min)) (let (beg end field) - (while (re-search-forward "^.+:.*\\(\n\\s +.*\\)*" nil t) + (while (re-search-forward rfc822/field-top-regexp nil t) (setq beg (match-beginning 0)) - (setq end (match-end 0)) - (if (setq field (mime/encode-field - (buffer-substring-no-properties beg end))) + (setq end (rfc822/field-end)) + (if (and (find-charset-region beg end) + (setq field + (mime/encode-field + (buffer-substring-no-properties beg end) + )) + ) (progn (delete-region beg end) (insert field) diff --git a/tm-view.el b/tm-view.el index 5c1f9f0..5e8bac7 100644 --- a/tm-view.el +++ b/tm-view.el @@ -25,7 +25,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.11 1995/10/06 07:00:00 morioka Exp $") + "$Id: tm-view.el,v 7.12 1995/10/11 12:12:06 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -358,7 +358,7 @@ The compressed face will be piped to this command.") (ctype (mime::content-info/type content)) (params (mime::content-info/parameters content)) (encoding (mime::content-info/encoding content)) - (cnum (mime::get-point-content-number beg cinfo)) + (cnum (mime-article/point-content-number beg cinfo)) he e nb ne subj) (set-buffer ibuf) (goto-char beg) @@ -491,7 +491,7 @@ The compressed face will be piped to this command.") ;;; @ content information ;;; -(defun mime::get-point-content-number (p &optional cinfo) +(defun mime-article/point-content-number (p &optional cinfo) (or cinfo (setq cinfo mime::article/content-info) ) @@ -504,7 +504,7 @@ The compressed face will be piped to this command.") (catch 'tag (while c (setq co (car c)) - (setq ret (mime::get-point-content-number p co)) + (setq ret (mime-article/point-content-number p co)) (cond ((eq ret t) (throw 'tag (list sn))) (ret (throw 'tag (cons sn ret))) ) @@ -724,7 +724,7 @@ listed in key order: cinfo) (switch-to-buffer (mime::preview-content-info/buffer pc)) (setq cinfo (mime::preview-content-info/content-info pc)) - (mime::get-point-content-number (mime::content-info/point-min cinfo)) + (mime-article/point-content-number (mime::content-info/point-min cinfo)) ))) (defun mime-preview/cinfo-to-pcinfo (cinfo) @@ -774,7 +774,7 @@ listed in key order: cn r) (switch-to-buffer (mime::preview-content-info/buffer pc)) (setq cinfo (mime::preview-content-info/content-info pc)) - (setq cn (mime::get-point-content-number + (setq cn (mime-article/point-content-number (mime::content-info/point-min cinfo))) (if (eq cn t) (mime-viewer/quit the-buf -- 1.7.10.4