From: morioka Date: Mon, 9 Mar 1998 11:59:55 +0000 (+0000) Subject: tm 7.29. X-Git-Tag: tm7_29~1 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9c2cd8cef3fe701ef56a54994e3896990ed8edd4;p=elisp%2Ftm.git tm 7.29. --- diff --git a/Changes-7.29.en b/Changes-7.29.en new file mode 100644 index 0000000..857b1ab --- /dev/null +++ b/Changes-7.29.en @@ -0,0 +1,16 @@ +Tue Dec 5 07:58:52 1995 Morioka Tomohiko + + * tm: Version 7.29 was released. + * tm/mh-e: Version 7.41 was released. + * tm/gnus: Version 7.20.1 was released. + * tl: Version 7.02 was released. + + * tm-edit.el: Setting for ISO-2022-KR. + +Mon Dec 4 20:33:11 1995 Shuhei KOBAYASHI + + * tm-vm.el: + setting for mime-viewer/over-to-(previous|next)-method-alist. + (cf. [tm-ja:1195]) + + * tm-view.el: New keybind "<" and ">" (cf. [tm-ja:1195]) diff --git a/Changes-7.29.ja b/Changes-7.29.ja new file mode 100644 index 0000000..066e29a --- /dev/null +++ b/Changes-7.29.ja @@ -0,0 +1,18 @@ +Tue Dec 5 07:58:52 1995 Morioka Tomohiko + + * tm: Version 7.29 was released. + * tm/mh-e: Version 7.41 was released. + * tm/gnus: Version 7.20.1 was released. + * tl: Version 7.02 was released. + + * tm-edit.el: Setting for ISO-2022-KR. + +Mon Dec 4 20:33:11 1995 Shuhei KOBAYASHI + + * tm-vm.el: + VM 用の mime-viewer/over-to-(previous|next)-method-alist を設定 + (cf. [tm-ja:1195]) + + * tm-view.el: + mime-viewer/mode に対する keybind の追加 ("<", ">") + (cf. [tm-ja:1195]) diff --git a/Makefile b/Makefile index 3a0c9ba..dabccc3 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,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.28.tar.gz +TARFILE = tm7.29.tar.gz 18: diff --git a/gnus/ChangeLog-7.20.1.en b/gnus/ChangeLog-7.20.1.en new file mode 100644 index 0000000..b543e3f --- /dev/null +++ b/gnus/ChangeLog-7.20.1.en @@ -0,0 +1,37 @@ +Tue Dec 5 07:51:04 1995 Morioka Tomohiko + + * tm/gnus: Version 7.20.1 was released. + + * Makefile: fixed typo of `install-18'. + +Tue Dec 5 07:36:32 1995 Morioka Tomohiko + + * tm-gnus4.el: Function `tm-gnus/preview-article-if-you-need' was + fixed to set variable `tm-gnus/automatic-mime-preview' and + variable `gnus-original-article-buffer'. + +Mon Dec 4 23:55:05 1995 Morioka Tomohiko + + * tm-gnus.el: + call-after-loaded definitions for tm-edit are merged. + +Mon Dec 4 20:33:11 1995 Shuhei KOBAYASHI + + * tm-gnus.el: + mime-editor/message-inserter-alist setting for mail-mode + (cf. [tm-ja:1195]) + +Tue Dec 4 14:30:44 1995 Dave Goldberg + + * Makefile: + There's a problem with tm/gnus/Makefile. In particular, the order + of the -l arguments is wrong because of the + (require 'tl-misc) in the g*-path files. Since load-path gets set + to find ../../tl in mk-tgnus.el, that has to be loaded first. + +Mon Dec 4 06:32:43 1995 Morioka Tomohiko + + * tm-gnus4.el: + OKABE, Yasuo 's patch was applied to fix + problem of function `tm-gnus/view-message' in automatic MIME preview + mode. (cf. [tm-ja:1191]) diff --git a/gnus/ChangeLog-7.20.1.ja b/gnus/ChangeLog-7.20.1.ja new file mode 100644 index 0000000..b0d5314 --- /dev/null +++ b/gnus/ChangeLog-7.20.1.ja @@ -0,0 +1,36 @@ +Tue Dec 5 07:51:04 1995 Morioka Tomohiko + + * tm/gnus: Version 7.20.1 was released. + + * Makefile: fixed typo of `install-18'. + +Tue Dec 5 07:36:32 1995 Morioka Tomohiko + + * tm-gnus4.el: Function `tm-gnus/preview-article-if-you-need' was + fixed to set variable `tm-gnus/automatic-mime-preview' and + variable `gnus-original-article-buffer'. + +Mon Dec 4 23:55:05 1995 Morioka Tomohiko + + * tm-gnus.el: tm-edit 用の call-after-loaded 宣言をくっつけた。 + +Mon Dec 4 20:33:11 1995 Shuhei KOBAYASHI + + * tm-gnus.el: + Gnus でも mail-mode 用の mime-editor/message-inserter-alist を設定 + (cf. [tm-ja:1195]) + +Tue Dec 4 14:30:44 1995 Dave Goldberg + + * Makefile: + There's a problem with tm/gnus/Makefile. In particular, the order + of the -l arguments is wrong because of the + (require 'tl-misc) in the g*-path files. Since load-path gets set + to find ../../tl in mk-tgnus.el, that has to be loaded first. + +Mon Dec 4 06:32:43 1995 Morioka Tomohiko + + * tm-gnus4.el: + OKABE, Yasuo 's patch was applied to fix + problem of function `tm-gnus/view-message' in automatic MIME preview + mode. (cf. [tm-ja:1191]) diff --git a/gnus/Makefile b/gnus/Makefile index fad4689..a0996be 100644 --- a/gnus/Makefile +++ b/gnus/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 7.0 1995/12/04 00:41:08 morioka Exp morioka $ +# $Id: Makefile,v 7.2 1995/12/05 07:51:04 morioka Exp morioka $ # # Please specify emacs executables: @@ -27,32 +27,32 @@ TMDIR19_29 = $(DATADIR19_29)/$(EMACS_PREFIX)/site-lisp FILES = tm/gnus/*.el tm/doc/tm-gnus*.texi -TARFILE = tm-gnus7.20.tar +TARFILE = tm-gnus7.20.1.tar gnus: $(EMACS) -batch -l mk-tgnus -f compile-tm-gnus gnus3: - $(EMACS) -batch -l g3-path -l mk-tgnus -f compile-tm-gnus + $(EMACS) -batch -l mk-tgnus -l g3-path -f compile-tm-gnus gnus4: - $(EMACS) -batch -l g4-path -l mk-tgnus -f compile-tm-gnus + $(EMACS) -batch -l mk-tgnus -l g4-path -f compile-tm-gnus gnus5: - $(EMACS) -batch -l g5-path -l mk-tgnus -f compile-tm-gnus + $(EMACS) -batch -l mk-tgnus -l g5-path -f compile-tm-gnus sgnus: - $(EMACS) -batch -l s-path -l mk-tgnus -f compile-tm-gnus + $(EMACS) -batch -l mk-tgnus -l s-path -f compile-tm-gnus install-18: - $(EMACS) -batch -l g3-path -l mk-tgnus -f install-tm-gnus $(TMDIR18) + $(EMACS) -batch -l mk-tgnus g3-path -f install-tm-gnus $(TMDIR18) install-19: - $(EMACS) -batch -l g4-path -l mk-tgnus -f install-tm-gnus $(TMDIR19) + $(EMACS) -batch -l mk-tgnus -l g4-path -f install-tm-gnus $(TMDIR19) install-19_29: - $(EMACS) -batch -l g4-path -l mk-tgnus -f install-tm-gnus $(TMDIR19_29) + $(EMACS) -batch -l mk-tgnus -l g4-path -f install-tm-gnus $(TMDIR19_29) clean: -rm *.elc diff --git a/gnus/s-path b/gnus/s-path index a3cb498..35ce11d 100644 --- a/gnus/s-path +++ b/gnus/s-path @@ -7,4 +7,4 @@ ;;; ;; please edit -(add-path "sgnus-0.17/lisp") +(add-path "sgnus-0.18/lisp") diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el index 9a29778..501203d 100644 --- a/gnus/tm-gnus.el +++ b/gnus/tm-gnus.el @@ -4,11 +4,12 @@ ;;; Copyright (C) 1995 Free Software Foundation, Inc. ;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko ;;; -;;; Author: Morioka Tomohiko +;;; Author: MORIOKA Tomohiko +;;; modified by KOBAYASHI Shuhei ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/20 (obsolete mol's gnus-mime.el) ;;; Version: -;;; $Id: tm-gnus.el,v 7.9 1995/11/21 03:00:41 morioka Exp $ +;;; $Id: tm-gnus.el,v 7.11 1995/12/04 23:55:05 morioka Exp $ ;;; Keywords: news, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -101,6 +102,10 @@ (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)) ))) diff --git a/gnus/tm-gnus4.el b/gnus/tm-gnus4.el index d37351c..c2c316a 100644 --- a/gnus/tm-gnus4.el +++ b/gnus/tm-gnus4.el @@ -8,7 +8,7 @@ ;;; modified by OKABE Yasuo ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/20 (merged tm-gnus5.el) -;;; Version: $Revision: 7.9 $ +;;; Version: $Revision: 7.11 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -35,7 +35,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus4.el,v 7.9 1995/12/03 17:30:57 morioka Exp $") + "$Id: tm-gnus4.el,v 7.11 1995/12/05 07:36:32 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for 3.15 .. 5.1")) @@ -60,7 +60,8 @@ This variable is set to `gnus-show-mime'.") (defun tm-gnus/view-message (arg) "MIME decode and play this message." (interactive "P") - (let ((gnus-break-pages nil)) + (let ((gnus-break-pages nil) + (gnus-show-mime nil)) (gnus-summary-select-article t t) ) (pop-to-buffer gnus-article-buffer t) @@ -185,6 +186,8 @@ This variable is set to `gnus-show-mime'.") (mime/viewer-mode nil nil nil tm-gnus/original-article-buffer gnus-article-buffer) (gnus-article-show-summary) + (setq tm-gnus/automatic-mime-preview t) + (setq gnus-original-article-buffer tm-gnus/original-article-buffer) (run-hooks 'tm-gnus/article-prepare-hook) ))) diff --git a/mh-e/ChangeLog-7.41.en b/mh-e/ChangeLog-7.41.en new file mode 100644 index 0000000..4c780aa --- /dev/null +++ b/mh-e/ChangeLog-7.41.en @@ -0,0 +1,13 @@ +Tue Dec 5 17:14:13 1995 Morioka Tomohiko + + * tm/mh-e: Version 7.41 was released. + +Mon Dec 4 03:45:44 1995 Morioka Tomohiko + + * tm-mh-e.el: (defalias 'mh-get-header-field 'mh-get-field) if + function `mh-get-header-field' is not exist. (function + `mh-get-header-field' is mh-e 5.* function) + + * tm-mh-e3.el: + (1) New variable `mh-forward-subject-format' + (2) New function `mh-forwarded-letter-subject' diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index d1f4336..b81b3b0 100644 --- a/mh-e/tm-mh-e.el +++ b/mh-e/tm-mh-e.el @@ -9,7 +9,7 @@ ;;; modified by YAMAOKA Katsumi ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/21 (obsolete mh-e-mime.el) -;;; Version: $Revision: 7.40 $ +;;; Version: $Revision: 7.41 $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -36,12 +36,16 @@ ) (require 'tm-view) +(or (fboundp 'mh-get-header-field) + (defalias 'mh-get-header-field 'mh-get-field) + ) + ;;; @ version ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.40 1995/12/03 10:02:17 morioka Exp $") + "$Id: tm-mh-e.el,v 7.41 1995/12/04 03:45:44 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) diff --git a/mh-e/tm-mh-e3.el b/mh-e/tm-mh-e3.el index 343698a..68d5a2c 100644 --- a/mh-e/tm-mh-e3.el +++ b/mh-e/tm-mh-e3.el @@ -1,5 +1,5 @@ ;;; -;;; $Id: tm-mh-e3.el,v 7.0 1995/12/01 19:14:52 morioka Exp $ +;;; $Id: tm-mh-e3.el,v 7.1 1995/12/04 03:43:30 morioka Exp $ ;;; ;;; This is a part of tm-mh-e.el which is a module for old mh-e ;;; to emulate mh-e 4.*. @@ -49,6 +49,24 @@ The value of mh-show-mode-hook is called when a new message is displayed." ;; May someday do completion on aliases. (read-string prompt)) +(defvar mh-forward-subject-format "%s: %s" + "*Format to generate the Subject: line contents for a forwarded message. +The two string arguments to the format are the sender of the original +message and the original subject line.") + +(defun mh-forwarded-letter-subject (from subject) + ;; Return a Subject suitable for a forwarded message. + ;; Original message has headers FROM and SUBJECT. + (let ((addr-start (string-match "<" from)) + (comment (string-match "(" from))) + (cond ((and addr-start (> addr-start 0)) + ;; Full Name + (setq from (substring from 0 (1- addr-start)))) + (comment + ;; luser@host (Full Name) + (setq from (substring from (1+ comment) (1- (length from))))))) + (format mh-forward-subject-format from subject)) + ;;; @ end ;;; diff --git a/tm-edit.el b/tm-edit.el index 142aa45..93743a5 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -107,7 +107,7 @@ ;; LCD Archive Entry: ;; mime|Masanobu UMEDA|umerin@mse.kyutech.ac.jp| ;; Simple MIME Composer| -;; $Date: 1995/11/25 02:14:25 $|$Revision: 7.28 $|~/misc/mime.el.Z| +;; $Date: 1995/12/05 07:58:52 $|$Revision: 7.29 $|~/misc/mime.el.Z| ;;; Code: @@ -125,7 +125,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.28 1995/11/25 02:14:25 morioka Exp $") + "$Id: tm-edit.el,v 7.29 1995/12/05 07:58:52 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1714,6 +1714,8 @@ in Mule." '("ISO-8859-9" . "quoted-printable")) ((memq lc-jp lclist) '("ISO-2022-JP" . nil)) + ((memq lc-kr lclist) + '("ISO-2022-KR" . nil)) ;; Unknown charset. ((boundp '*iso-2022-int-1*) '("ISO-2022-INT-1" . nil)) @@ -1742,6 +1744,7 @@ text." ("ISO-8859-9" . *iso-8859-9*) ("ISO-2022-JP" . *junet*) ("ISO-2022-JP-2" . *iso-2022-ss2-7*) + ("ISO-2022-KR" . *korean-mail*) ("ISO-2022-INT-1" . *iso-2022-int-1*) ))))) ;; In bilingual environment it may be unnecessary to convert the @@ -1833,6 +1836,8 @@ a recording host instead of local host." (let ((header-start (point)) (case-fold-search t) beg end) + ;; for Emacs 18 + ;; (if (re-search-forward "^$" (marker-position (mark-marker))) (if (re-search-forward "^$" (mark t)) (narrow-to-region header-start (match-beginning 0)) ) diff --git a/tm-view.el b/tm-view.el index 7fc3b6a..309b547 100644 --- a/tm-view.el +++ b/tm-view.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.28 $ +;;; Version: $Revision: 7.29 $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.28 1995/12/04 00:24:19 morioka Exp $") + "$Id: tm-view.el,v 7.29 1995/12/05 08:05:18 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -687,6 +687,10 @@ The compressed face will be piped to this command.") "q" (function mime-viewer/quit)) (define-key mime/viewer-mode-map "\C-c\C-x" (function mime-viewer/kill-buffer)) + (define-key mime/viewer-mode-map + "<" (function beginning-of-buffer)) + (define-key mime/viewer-mode-map + ">" (function end-of-buffer)) (if mouse-button-2 (define-key mime/viewer-mode-map mouse-button-2 (function tm:button-dispatcher)) @@ -883,50 +887,64 @@ listed in key order: (or h (setq h (- (window-height) 1)) ) - (let ((pcl mime::preview/content-list) - (p (point)) - np beg) - (setq np - (or (catch 'tag - (while pcl - (setq beg (mime::preview-content-info/point-min (car pcl))) - (if (< p beg) - (throw 'tag beg) - ) - (setq pcl (cdr pcl)) - )) - (point-max))) - (forward-line h) - (if (> (point) np) - (goto-char np) - ) - ;;(show-subtree) - )) + (if (= (point) (point-max)) + (let ((f (assq mime::preview/original-major-mode + mime-viewer/over-to-next-method-alist))) + (if f + (funcall (cdr f)) + )) + (let ((pcl mime::preview/content-list) + (p (point)) + np beg) + (setq np + (or (catch 'tag + (while pcl + (setq beg (mime::preview-content-info/point-min (car pcl))) + (if (< p beg) + (throw 'tag beg) + ) + (setq pcl (cdr pcl)) + )) + (point-max))) + (forward-line h) + (if (> (point) np) + (goto-char np) + ) + ;;(show-subtree) + )) + ) (defun mime-viewer/scroll-down-content (&optional h) (interactive) (or h (setq h (- (window-height) 1)) ) - (let ((pcl mime::preview/content-list) - (p (point)) - pp beg) - (setq pp - (or (let ((i (- (length pcl) 1))) - (catch 'tag - (while (> i 0) - (setq beg (mime::preview-content-info/point-min - (nth i pcl))) - (if (> p beg) - (throw 'tag beg) - ) - (setq i (- i 1)) - ))) - (point-min))) - (forward-line (- h)) - (if (< (point) pp) - (goto-char pp) - ))) + (if (= (point) (point-min)) + (let ((f (assq mime::preview/original-major-mode + mime-viewer/over-to-previous-method-alist))) + (if f + (funcall (cdr f)) + )) + (let ((pcl mime::preview/content-list) + (p (point)) + pp beg) + (setq pp + (or (let ((i (- (length pcl) 1))) + (catch 'tag + (while (> i 0) + (setq beg (mime::preview-content-info/point-min + (nth i pcl))) + (if (> p beg) + (throw 'tag beg) + ) + (setq i (- i 1)) + ))) + (point-min))) + (forward-line (- h)) + (if (< (point) pp) + (goto-char pp) + ))) + ) (defun mime-viewer/next-line-content () (interactive) diff --git a/tm-vm.el b/tm-vm.el index 142b802..8156b46 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -11,7 +11,7 @@ ;;; modified by SHIONO Jun'ichi ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.23 $ +;;; Version: $Revision: 7.25 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -36,7 +36,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.23 1995/12/03 14:09:18 morioka Exp $") + "$Id: tm-vm.el,v 7.25 1995/12/04 23:44:47 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -140,12 +140,14 @@ all marked messages are affected, other messages are ignored." ;;; (cf. [tm-eng:163]) ;; Selecting a new mail message, but we're already displaying a mime ;; on in the window, make sure that the mail buffer is displayed. - (if (get-buffer-window "*MIME-out*") - (delete-window (get-buffer-window (get-buffer "*MIME-out*"))) + (if (get-buffer-window mime/output-buffer-name) + (delete-window (get-buffer-window (get-buffer mime/output-buffer-name))) ) - (if (and tm-vm/automatic-mime-preview + ;; fixed by Shuhei KOBAYASHI + ;; 1995/12/4 (cf. [tm-ja:1190]) + (if (and vm-message-pointer tm-vm/automatic-mime-preview ;; fixed by SHIONO Jun'ichi - ;; 1995/11/17 (cf.[tm-ja:1120]) + ;; 1995/11/17 (cf. [tm-ja:1120]) (display-buffer (current-buffer)) (let* ((mp (car vm-message-pointer)) (ct (vm-get-header-contents mp "Content-Type:")) @@ -164,12 +166,14 @@ all marked messages are affected, other messages are ignored." (let ((pwin (and mime::article/preview-buffer (get-buffer mime::article/preview-buffer) (get-buffer-window mime::article/preview-buffer)))) - (if pwin + (if (and pwin + (not (eq win pwin))) (delete-window pwin) )) (vm-display nil nil '(vm-next-message - vm-delete-message + vm-previous-message + vm-delete-message vm-undelete-message vm-scroll-forward vm-scroll-backward) (list this-command 'reading-message)) @@ -304,6 +308,26 @@ all marked messages are affected, other messages are ignored." (select-window summary-win))) ))) +(set-alist 'mime-viewer/over-to-previous-method-alist + 'vm-mode + (function + (lambda () + (set-buffer mime::preview/article-buffer) + (setq this-command 'vm-previous-message) + (vm-previous-message 1 nil t) + (tm-vm/view-message) + ))) + +(set-alist 'mime-viewer/over-to-next-method-alist + 'vm-mode + (function + (lambda () + (set-buffer mime::preview/article-buffer) + (setq this-command 'vm-next-message) + (vm-next-message 1 nil t) + (tm-vm/view-message) + ))) + ;; 1995/11/16 by Oscar Figueiredo (defun tm-vm/expunge-folder () (interactive)