From d36a8408e066d50ff46f0788fbd0fca317b168f1 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:04:27 +0000 Subject: [PATCH] tm 7.66.2. --- ChangeLog | 18 +++++++++++++ Makefile | 2 +- TM-CFG | 13 +++++++--- gnus/ChangeLog | 37 +++++++++++++++++++++++++++ gnus/Makefile | 2 +- gnus/s-path | 9 +++---- gnus/tm-gnus.el | 62 +------------------------------------------- gnus/tm-gnus3.el | 43 +++++++++++++++++++++++++++++-- gnus/tm-gnus4.el | 64 ++++++++++++++++++++++++++++++++++++++++++++-- gnus/tm-sgnus.el | 75 +++++++++++++++++++++++++++++++++++++++++++----------- inst-tm | 4 +-- mh-e/ChangeLog | 6 +++++ mh-e/tmh-comp.el | 7 ++--- tm-ew-e.el | 6 ++--- tm-parse.el | 9 +++++-- 15 files changed, 256 insertions(+), 101 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51c97ca..aa2a6b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Sun Jun 9 04:13:53 1996 MORIOKA Tomohiko + + * MEL: Version 5.4 was released. + * tm: Version 7.66.2 was released. + * tm/gnus: Version 7.68 was released. + +Fri Jun 7 14:14:53 1996 MORIOKA Tomohiko + + * inst-tm (install-elc): check `src-file' has existed yet. + +Thu Jun 6 15:03:38 1996 MORIOKA Tomohiko + + * tm-ew-e.el (mime/encode-field): fixed. + + * tm-parse.el (mime/Content-Transfer-Encoding): eliminate last + linear-white-spaces. + + Mon Jun 3 14:52:18 1996 MORIOKA Tomohiko * tl: Version 7.29.1 was released. diff --git a/Makefile b/Makefile index 2b6c15b..763a346 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.66.1.tar.gz +TARFILE = tm7.66.2.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index 658eb56..5cb2d4f 100644 --- a/TM-CFG +++ b/TM-CFG @@ -119,16 +119,21 @@ "site-lisp" "local.lisp")) +(setq PATTERN-TO-INSTALL + (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX)) +(setq PATTERN-TO-AVOID + (format "%d\\.%s" emacs-major-version emacs-minor-version)) + (defvar LISPDIR (or (catch 'tag (let ((rest default-load-path) dir) (while (setq dir (car rest)) - (if (string-match - (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX) dir) - (throw 'tag (substring dir 0 (match-end 0))) - ) + (or (string-match PATTERN-TO-AVOID dir) + (if (string-match PATTERN-TO-INSTALL dir) + (throw 'tag (substring dir 0 (match-end 0))) + )) (setq rest (cdr rest)) ))) (expand-file-name (concat diff --git a/gnus/ChangeLog b/gnus/ChangeLog index b35341a..abd931f 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,40 @@ +Sun Jun 9 04:12:44 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.68 was released. + +Fri Jun 7 13:48:05 1996 MORIOKA Tomohiko + + * tm-sgnus.el: Use `(call-after-loaded 'nnmail ...)' to redefine + function `nnmail-find-file', so you must use Gnus 5.2.10 or later + if you use Mule. + +Thu Jun 6 16:44:17 1996 Shuhei KOBAYASHI + + * tm-gnus3.el (tm-gnus/insert-article): Moved from tm-gnus.el + + * tm-gnus4.el (tm-gnus/insert-article), + (mime-editor/attach-to-news-reply-menu): Moved from tm-gnus.el + + * tm-gnus.el: `tm-gnus/insert-article' and + `mime-editor/attach-to-news-reply-menu' were moved to + version-dependent modules. + + * tm-sgnus.el (tm-gnus/insert-article): New function; + message/rfc822 inserter for message-mode. + (mime-editor/attach-to-news-reply-menu): Moved from tm-gnus.el + +Wed Jun 5 23:02:22 1996 Shuhei KOBAYASHI + + * tm-sgnus.el (nnmail-find-file): Leave + `jam-code-guess-after-insert-file-function' in + `after-insert-file-functions'. + +Wed Jun 5 02:49:33 1996 MORIOKA Tomohiko + + * tm-sgnus.el: Compatibility code for September Gnus 0.80 .. 0.94 + was deleted. + + Mon May 27 03:48:56 1996 MORIOKA Tomohiko * tm/gnus: Version 7.63 was released. diff --git a/gnus/Makefile b/gnus/Makefile index ac15237..ba137a4 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.63.tar +TARFILE = tm-gnus7.68.tar gnus: diff --git a/gnus/s-path b/gnus/s-path index 8a3cbf3..1fcce1c 100644 --- a/gnus/s-path +++ b/gnus/s-path @@ -3,20 +3,19 @@ (require 'tl-misc) ;;; -;;; loadpath for September Gnus +;;; loadpath for Gnus 5.2 ;;; ;; please edit ;; It is for latest September Gnus. -(let ((path (or (get-latest-path "gnus-5.2") - (get-latest-path "sgnus")))) +(let ((path (get-latest-path "gnus-5.2"))) (if path (add-path (expand-file-name "lisp/" path)) )) ;; It is relative style. Added path is searched from load-path. -;; (add-path "sgnus-0.69/lisp/" 'all-paths) +;; (add-path "gnus-5.2.10/lisp/" 'all-paths) ;; It is absolute style. -;; (add-path "/usr/local/share/emacs/site-lisp/sgnus/lisp/") +;; (add-path "/usr/local/share/emacs/site-lisp/gnus-5.2.10/lisp/") diff --git a/gnus/tm-gnus.el b/gnus/tm-gnus.el index eadfb89..42915ef 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.20 1996/03/04 08:18:09 morioka Exp $ +;;; $Id: tm-gnus.el,v 7.21 1996/06/06 16:42:20 shuhei-k Exp $ ;;; Keywords: news, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -111,66 +111,6 @@ )) -;;; @ for tm-edit -;;; - -;; suggested by OKABE Yasuo -;; 1995/11/08 (c.f. [tm ML:1067]) -(defun tm-gnus/insert-article (&optional message) - (interactive) - (let (;; for Emacs 19 - (mail-citation-hook '(mime-editor/inserted-message-filter)) - news-reply-header-hook - mail-yank-hooks - - ;; for Emacs 18 - (mail-yank-ignored-headers mime-editor/yank-ignored-field-regexp) - (news-make-reply-yank-header (function - (lambda (message-id from) "") - )) - (news-yank-original-quoting-indicator "") - - ;; select raw article buffer - (mail-reply-buffer - (save-excursion - (set-buffer gnus-article-buffer) - (if (eq major-mode 'mime/viewer-mode) - mime::preview/article-buffer - gnus-article-buffer))) - ) - (news-reply-yank-original 0) - )) - -;;; modified by Steven L. Baur -;;; 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-edit - (function - (lambda () - (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)) - (if (string-match "XEmacs\\|Lucid" emacs-version) - (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu) - ) - ))) - - ;;; @ end ;;; diff --git a/gnus/tm-gnus3.el b/gnus/tm-gnus3.el index 25f56fe..34d1067 100644 --- a/gnus/tm-gnus3.el +++ b/gnus/tm-gnus3.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/20 -;;; Version: $Revision: 7.8 $ +;;; Version: $Revision: 7.9 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -46,7 +46,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus3.el,v 7.8 1996/04/08 12:26:21 morioka Exp $") + "$Id: tm-gnus3.el,v 7.9 1996/06/06 16:44:17 shuhei-k Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for GNUS 3")) @@ -172,6 +172,45 @@ With arg, turn MIME encoded-word processing on iff arg is positive." ))) +;;; @ for tm-edit +;;; + +;; suggested by OKABE Yasuo +;; 1995/11/08 (c.f. [tm ML:1067]) +(defun tm-gnus/insert-article (&optional message) + (interactive) + (let (;; for Emacs 18 + (mail-yank-ignored-headers mime-editor/yank-ignored-field-regexp) + (news-make-reply-yank-header (function + (lambda (message-id from) "") + )) + (news-yank-original-quoting-indicator "") + + ;; select raw article buffer + (mail-reply-buffer + (save-excursion + (set-buffer gnus-article-buffer) + (if (eq major-mode 'mime/viewer-mode) + mime::preview/article-buffer + gnus-article-buffer))) + ) + (news-reply-yank-original 0) + )) + +(call-after-loaded + 'tm-edit + (function + (lambda () + (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)) + ))) + + ;;; @ for tm-partial ;;; diff --git a/gnus/tm-gnus4.el b/gnus/tm-gnus4.el index 7184732..a4cfce5 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.18 $ +;;; Version: $Revision: 7.19 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -37,7 +37,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-gnus4.el,v 7.18 1996/03/04 08:16:42 morioka Exp $") + "$Id: tm-gnus4.el,v 7.19 1996/06/06 16:43:42 shuhei-k Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for 3.15 .. 5.1.*")) @@ -123,6 +123,66 @@ This variable is set to `gnus-show-mime'.") ))) +;;; @ for tm-edit +;;; + +;; suggested by OKABE Yasuo +;; 1995/11/08 (c.f. [tm ML:1067]) +(defun tm-gnus/insert-article (&optional message) + (interactive) + (let (;; for Emacs 19 + (mail-citation-hook '(mime-editor/inserted-message-filter)) + news-reply-header-hook + mail-yank-hooks + + ;; for Emacs 18 + (mail-yank-ignored-headers mime-editor/yank-ignored-field-regexp) + (news-make-reply-yank-header (function + (lambda (message-id from) "") + )) + (news-yank-original-quoting-indicator "") + + ;; select raw article buffer + (mail-reply-buffer + (save-excursion + (set-buffer gnus-article-buffer) + (if (eq major-mode 'mime/viewer-mode) + mime::preview/article-buffer + gnus-article-buffer))) + ) + (news-reply-yank-original 0) + )) + +;;; modified by Steven L. Baur +;;; 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-edit + (function + (lambda () + (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)) + (if (string-match "XEmacs\\|Lucid" emacs-version) + (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu) + ) + ))) + + ;;; @ for tm-partial ;;; diff --git a/gnus/tm-sgnus.el b/gnus/tm-sgnus.el index 790830f..86f6b6b 100644 --- a/gnus/tm-sgnus.el +++ b/gnus/tm-sgnus.el @@ -6,8 +6,9 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko +;;; and KOBAYASHI Shuhei ;;; Created: 1995/09/24 -;;; Version: $Revision: 7.63 $ +;;; Version: $Revision: 7.68 $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +42,7 @@ ;;; (defconst tm-gnus/RCS-ID - "$Id: tm-sgnus.el,v 7.63 1996/05/27 03:48:56 morioka Exp $") + "$Id: tm-sgnus.el,v 7.68 1996/06/07 15:28:40 morioka Exp $") (defconst tm-gnus/version (concat (get-version-string tm-gnus/RCS-ID) " for September")) @@ -144,6 +145,45 @@ This variable is set to `gnus-show-mime'.") (function mime-viewer/quitting-method-for-sgnus)) +;;; @ for tm-edit +;;; + +;; suggested by OKABE Yasuo +;; 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 +;;; 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-edit + (function + (lambda () + (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) + ) + ))) + + ;;; @ for tm-partial ;;; @@ -237,28 +277,33 @@ This variable is set to `gnus-show-mime'.") (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-sgnus.el]" (set-buffer nntp-server-buffer) (erase-buffer) (let ((format-alist nil) - (after-insert-file-functions 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 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) - )) - ;; compatibility for September Gnus 0.80 .. 0.94 - (fset 'nnheader-insert-raw-file-contents - 'nnheader-insert-file-contents-literally) - (defun nnheader-find-file-noselect (filename &optional nowarn rawfile) - (let ((file-coding-system-for-read *noconv*)) - (find-file-noselect filename nowarn rawfile) - )) )) (defun tm-gnus/prepare-save-mail-function () (setq file-coding-system *noconv*) diff --git a/inst-tm b/inst-tm index 1f30392..d7e30da 100644 --- a/inst-tm +++ b/inst-tm @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 7.3 1996/05/28 03:40:11 morioka Exp $ +;;; $Id: inst-tm,v 7.4 1996/06/07 14:14:53 morioka Exp $ ;;; (load-file "TM-CFG") @@ -129,7 +129,7 @@ (let ((full-path (expand-file-name file dest))) (copy-file src-file full-path t t) (catch 'tag - (while t + (while (file-exists-p src-file) (condition-case err (progn (delete-file src-file) diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index c7716ea..8841918 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 5 02:34:06 1996 MORIOKA Tomohiko + + * tmh-comp.el: version check code was fixed for Emacs + 19.31. (cf. [tm-ja:1907]) + + Mon Jun 3 14:40:35 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.63 was released. diff --git a/mh-e/tmh-comp.el b/mh-e/tmh-comp.el index 4309a14..8f0a385 100644 --- a/mh-e/tmh-comp.el +++ b/mh-e/tmh-comp.el @@ -10,7 +10,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1996/2/29 (separated from tm-mh-e.el) ;;; Version: -;;; $Id: tmh-comp.el,v 7.0 1996/05/15 15:39:54 morioka Exp $ +;;; $Id: tmh-comp.el,v 7.1 1996/06/05 02:34:06 morioka Exp $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -391,12 +391,13 @@ then prompt for the message sequence. See also documentation for mh-note-forw "Forwarded:" config))))) -(cond ((not (boundp 'mh-e-version)) +(cond ((not (featurep 'mh-utils)) (defun tm-mh-e::insert-letter (folder number verbatim) (mh-insert-letter verbatim folder number) ) ) - ((string-lessp mh-e-version "5") + ((and (boundp 'mh-e-version) + (string-lessp mh-e-version "5")) (defun tm-mh-e::insert-letter (folder number verbatim) (mh-insert-letter number folder verbatim) ) diff --git a/tm-ew-e.el b/tm-ew-e.el index e51b5c9..a74c265 100644 --- a/tm-ew-e.el +++ b/tm-ew-e.el @@ -6,7 +6,7 @@ ;;; Copyright (C) 1993 .. 1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko -;;; Version: $Revision: 7.20 $ +;;; Version: $Revision: 7.21 $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -36,7 +36,7 @@ ;;; (defconst tm-ew-e/RCS-ID - "$Id: tm-ew-e.el,v 7.20 1996/06/03 14:33:35 morioka Exp $") + "$Id: tm-ew-e.el,v 7.21 1996/06/06 15:03:38 morioka Exp $") (defconst mime-eword/encoder-version (get-version-string tm-ew-e/RCS-ID)) @@ -508,7 +508,7 @@ )) (concat field-name ": " ret) ))) - (tm-eword::encode-string 0 str) + (car (tm-eword::encode-string 0 str)) ))) (defun mime/exist-encoded-word-in-subject () diff --git a/tm-parse.el b/tm-parse.el index d6fe8ca..0598d57 100644 --- a/tm-parse.el +++ b/tm-parse.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-parse.el,v 7.8 1996/04/20 12:17:27 morioka Exp $ +;;; $Id: tm-parse.el,v 7.9 1996/06/06 07:24:30 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -102,7 +102,12 @@ current-buffer, and return it. If is is not found, return DEFAULT-ENCODING. [tm-parse.el]" (let ((str (rfc822/get-field-body "Content-Transfer-Encoding"))) (if str - (downcase str) + (progn + (if (string-match "[ \t\n\r]+$" str) + (setq str (substring str 0 (match-beginning 0))) + ) + (downcase str) + ) default-encoding) )) -- 1.7.10.4