From 9fe6c4ff126d4294ca68315edb2caa5f0179ca12 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 10 Mar 1998 04:47:04 +0000 Subject: [PATCH] tm 7.83. --- ChangeLog | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 32 ++++++++++++++++-------- TM-CFG | 82 ++++++++++++++++++++++++++++++++++++++++++++---------------- TM-ELS | 4 +-- inst-tm | 41 ++++++++++++++++++++++++------ tm-edit.el | 6 ++--- 6 files changed, 188 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0793b..7f18038 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,71 @@ +Sat Sep 7 17:20:36 1996 MORIOKA Tomohiko + + * tl: Version 7.61.3 was released. + * tm: Version 7.83 was released. + * tm-mail: Version 7.25 was released. + * tm-vm: Version 7.63 was released. + + * Makefile: tm-mail.el and tm-rmail.el were moved to tm-mail + package. + tm-vm.el was moved to tm-vm package. + +Sat Sep 7 17:09:09 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/split-and-send): Use function + `std11-field-end' instead of `rfc822/field-end'. + +Sat Sep 7 09:20:30 1996 Hiroshi Ueno + + * TM-CFG (LISPDIR): Use `defvar' instead of `setq' for tm-os2. + +Fri Sep 6 18:41:10 1996 MORIOKA Tomohiko + + * TM-CFG: Add comments about add-path. (cf. [tm-en:747]) + + * TM-CFG (SHELL): detect from /bin/sh and + /usr/bin/sh. (cf. [tm-en:747]) + +Fri Sep 6 16:19:58 1996 MORIOKA Tomohiko + + * Makefile: Add options `PREFIX' and `EXEC_PREFIX'. + +Fri Sep 6 16:18:21 1996 MORIOKA Tomohiko + + * inst-tm (install-tm): install tm-mail and tm-vm. + + * TM-CFG (TM_MAIL_DIR, TM_VM_DIR): New variable. + + * inst-tm (compile-tm): compile tm-mail and tm-vm. + + * inst-tm (compile-tm): Use `mu-modules-to-compile'. + +Fri Sep 6 15:51:16 1996 MORIOKA Tomohiko + + * TM-CFG: add "../tm-mail" and "../tm-vm" to load-path. + +Fri Sep 6 15:50:07 1996 MORIOKA Tomohiko + + * TM-CFG: Use function `get-latest-path'. + + * inst-tm (config-tm): load ../tm-mail/TMAIL-ELS and .. + /tm-vm/TM-VM-ELS. + + * inst-tm (config-tm): New function. + (compile-tm, install-tm): Use function `config-tm'. + +Fri Sep 6 15:40:10 1996 MORIOKA Tomohiko + + * TM-ELS: tm-vm.el was moved to tm-vm package. + + * TM-ELS: tm-rmail.el and tm-mail.el were moved to tm-mail + package. + +Thu Sep 5 17:42:06 1996 MORIOKA Tomohiko + + * TM-CFG: Example of XEmacs directory tree in home was fixed. (cf. + [tm-en:746]) + + Thu Sep 5 14:36:14 1996 MORIOKA Tomohiko * tl: Version 7.61.2 was released. diff --git a/Makefile b/Makefile index 0c4f379..e6ccc17 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ # -# $Id: Makefile,v 7.27 1996/09/05 14:36:14 morioka Exp $ +# $Id: Makefile,v 7.29 1996/09/07 17:20:36 morioka Exp $ # +VERSION = 7.83 + SHELL = /bin/sh MAKE = make CC = gcc @@ -16,6 +18,9 @@ GOMI = $(BINS) mime-setup.el mime-setup.el~ \#mime-setup.el\# *.elc \ .gnus-compile* FLAGS = -batch -q -no-site-file +PREFIX = NONE +EXEC_PREFIX = + TM_FILES = tm/README.en tm/ChangeLog \ tm/Makefile tm/inst-tm tm/TM-ELS tm/TM-CFG \ tm/tm-def.el \ @@ -43,8 +48,12 @@ GNUS_MIME_FILES = gnus-mime/Makefile gnus-mime/*-path \ TM_GNUS_FILES = tm-gnus/Makefile tm-gnus/*-path tm-gnus/mk-tgnus \ tm-gnus/TGNUS-ELS tm-gnus/*.el tm-gnus/ChangeLog -TM_MUA_FILES = tm/tm-rmail.el tm/tm-vm.el tm/tm-mail.el \ - $(TM_MH_E_FILES) $(GNUS_MIME_FILES) $(TM_GNUS_FILES) +TM_MAIL_FILES = tm-mail/TMAIL-ELS tm-mail/*.el tm-mail/ChangeLog + +TM_VM_FILES = tm-vm/TM-VM-ELS tm-vm/*.el tm-vm/ChangeLog + +TM_MUA_FILES = $(TM_MH_E_FILES) $(GNUS_MIME_FILES) $(TM_GNUS_FILES) \ + $(TM_MAIL_FILES) $(TM_VM_FILES) MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/MEL-ELS mel/ChangeLog @@ -56,14 +65,12 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/TL-ELS \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(MU_FILES) $(TL_FILES) -TARFILE = tm7.82.tar.gz - elc: - $(EMACS) $(FLAGS) -l inst-tm -f compile-tm + $(EMACS) $(FLAGS) -l inst-tm -f compile-tm $(PREFIX) $(EXEC_PREFIX) # $(SHELL) .gnus-compile install-elc: elc - $(EMACS) $(FLAGS) -l inst-tm -f install-tm + $(EMACS) $(FLAGS) -l inst-tm -f install-tm $(PREFIX) $(EXEC_PREFIX) all: $(UTILS) $(DVI) elc @@ -86,7 +93,7 @@ ps: ol2 install: $(UTILS) methods install-elc - $(EMACS) $(FLAGS) -l inst-tm -f install-execs + $(EMACS) $(FLAGS) -l inst-tm -f install-execs $(PREFIX) $(EXEC_PREFIX) clean: @@ -97,6 +104,11 @@ clean: cd ../mel; PWD=`pwd` $(MAKE) clean -tar: +oomori: cd doc; $(MAKE) tex - cd ..; gtar cvzf $(TARFILE) $(FILES) + cd ..; gtar cvf tm$(VERSION).tar $(FILES) + -cd ..; mkdir tm$(VERSION) + cp ../tm-oomori/README.?? ../tm$(VERSION) + cd ../tm$(VERSION); gtar xvf ../tm$(VERSION).tar + cd ..; gtar cvzf tm$(VERSION).tar.gz tm$(VERSION) + cd ..; $(RM) -r tm$(VERSION); rm tm$(VERSION).tar diff --git a/TM-CFG b/TM-CFG index 7104bb9..c8197a1 100644 --- a/TM-CFG +++ b/TM-CFG @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-CFG,v 7.15 1996/09/04 15:32:36 morioka Exp morioka $ +;;; $Id: TM-CFG,v 7.22 1996/09/07 16:54:05 morioka Exp morioka $ ;;; (defvar default-load-path load-path) @@ -10,7 +10,8 @@ (expand-file-name path (getenv "PWD")) )) '("." "../tl" "../mu" "../mel" - "../tm-mh-e" "../gnus-mime" "../tm-gnus") + "../tm-mh-e" "../gnus-mime" "../tm-gnus" + "../tm-mail" "../tm-vm") ) load-path)) @@ -21,21 +22,58 @@ ;;; @ Please specify optional package directory if you use them. ;;; -;; Please specify VM path. -(add-path "vm-5.95beta" 'all-paths) +;; It is only necessary to use `add-path' if these packages are not +;; already on the standard load-path of Emacs. -;; Please specify Mailcrypt path. -(add-path "mailcrypt-3.4" 'all-paths) +;; Function `get-latest-path' detect latest version of such package +;; under load-path directories. If you want to use a version of a +;; package instead of latest version, please specify by argument of +;; function `add-path'. -;; Please specify BBDB path. -(add-path "bbdb-1.50" 'all-paths) +;; Function `add-path' finds path under load-path directories. If a +;; package does not exist in load-path, please specify by absolutely +;; (`~/' is available), for example +;; (add-path "~/lib/elisp/mailcrypt-3.4") +;; or +;; (add-path "/opt/share/xmule/site-lisp/mailcrypt-3.4") + +;;; @@ Please specify VM path. +;;; + +;; Use latest version installed in load-path. +(add-path (get-latest-path "vm" 'all-paths)) + +;; Or please specify path. +;; (add-path "vm-5.95beta" 'all-paths) + + +;;; @@ Please specify Mailcrypt path. +;;; + +;; Use latest version installed in load-path. +(add-path (get-latest-path "mailcrypt" 'all-paths)) + +;; Or please specify path. +;; (add-path "mailcrypt-3.4" 'all-paths) + + +;;; @@ Please specify BBDB path. +;;; + +(add-path (get-latest-path "bbdb" 'all-paths)) + +;; Or please specify path. +;; (add-path "bbdb-1.50" 'all-paths) ;;; @ shell ;;; ;; Please specify shell command path. -(setq SHELL "/bin/sh") +(setq SHELL + (find-if (function file-exists-p) + '("/bin/sh" "/usr/bin/sh") + )) ;; Please specify shell command option. (setq SHELLOPTION "-c") @@ -46,15 +84,15 @@ ;; Please specify install path prefix. ;; If it is omitted, shared directory (maybe /usr/local is used). -(setq PREFIX install-prefix) +(defvar PREFIX install-prefix) ;;(setq PREFIX "~/") ;; Please specify install path prefix for binaries. -(setq EXEC_PREFIX - (if (or running-emacs-18 running-xemacs) - (expand-file-name "../../.." exec-directory) - (expand-file-name "../../../.." exec-directory) - )) +(defvar EXEC_PREFIX + (if (or running-emacs-18 running-xemacs) + (expand-file-name "../../.." exec-directory) + (expand-file-name "../../../.." exec-directory) + )) ;; Please specify tm package prefix [optional] (setq TM_PACKAGE_PREFIX "") @@ -96,11 +134,11 @@ ;; For example, if = "~/" and you use XEmacs, ;; ;; = ~/share/xemacs/site-lisp/ -;; ~/share/xemacs/site-lisp/mime-setup.{el|elc} -;; ~/share/xemacs/site-lisp/tl/ --- tl lisp files -;; ~/share/xemacs/site-lisp/mu/ --- MU lisp files -;; ~/share/xemacs/site-lisp/mel/ --- MEL lisp files -;; ~/share/xemacs/site-lisp/tm/ --- tm lisp files +;; ~/lib/xemacs/site-lisp/mime-setup.{el|elc} +;; ~/lib/xemacs/site-lisp/tl/ --- tl lisp files +;; ~/lib/xemacs/site-lisp/mu/ --- MU lisp files +;; ~/lib/xemacs/site-lisp/mel/ --- MEL lisp files +;; ~/lib/xemacs/site-lisp/tm/ --- tm lisp files ;;; @ executables @@ -120,7 +158,7 @@ ;; It is generated by automatically. Please set variable `PREFIX'. ;; If you don't like default directory tree, please set it. -(setq LISPDIR (install-detect-elisp-directory PREFIX)) +(defvar LISPDIR (install-detect-elisp-directory PREFIX)) ;; (setq install-default-elisp-directory "~/lib/emacs/lisp") ;; Please specify mime-setup.{el|elc} install path. @@ -135,6 +173,8 @@ (setq TM_MHE_DIR TM_KERNEL_DIR) (setq TM_GNUS_DIR TM_KERNEL_DIR) (setq Gnus_MIME_DIR TM_KERNEL_DIR) +(setq TM_MAIL_DIR TM_KERNEL_DIR) +(setq TM_VM_DIR TM_KERNEL_DIR) (cond ((member LISPDIR default-load-path) (if (string-equal TM_PACKAGE_PREFIX "") diff --git a/TM-ELS b/TM-ELS index 33ea3f3..0604599 100644 --- a/TM-ELS +++ b/TM-ELS @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-ELS,v 7.1 1996/08/21 11:56:50 morioka Exp $ +;;; $Id: TM-ELS,v 7.3 1996/09/06 15:40:10 morioka Exp $ ;;; (setq tm-modules-to-compile @@ -9,7 +9,6 @@ tm-ew-d tm-parse tm-view tm-text tm-play tm-partial tm-latex tm-html tm-tar tm-file tm-ew-e tm-edit - tm-rmail tm-mail tm-setup)) (setq tm-modules-not-to-compile '(sc-setup)) @@ -27,7 +26,6 @@ ) ))) '((ange-ftp . tm-ftp) - (vm . tm-vm) (mailcrypt . tm-pgp) (bbdb . tm-bbdb) )) diff --git a/inst-tm b/inst-tm index 1e0009e..9c2f796 100644 --- a/inst-tm +++ b/inst-tm @@ -1,14 +1,32 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 7.34 1996/09/04 15:43:19 morioka Exp $ +;;; $Id: inst-tm,v 7.39 1996/09/06 16:18:21 morioka Exp $ ;;; -(load-file "TM-CFG") -(load-file "../tl/TL-ELS") -(load-file "../mu/MU-ELS") -(load-file "../mel/MEL-ELS") -(load-file "TM-ELS") -(load-file "../tm-mh-e/TMH-ELS") +(defun config-tm () + (let (prefix exec-prefix) + (setq prefix (car command-line-args-left)) + (and prefix + (not (string-equal "NONE" prefix)) + (progn + (defvar PREFIX prefix) + (setq command-line-args-left (cdr command-line-args-left)) + ) + (setq exec-prefix (car command-line-args-left)) + (progn + (defvar EXEC_PREFIX exec-prefix) + ;;(setq command-line-args-left (cdr command-line-args-left)) + ))) + (load-file "TM-CFG") + (load-file "../tl/TL-ELS") + (load-file "../mu/MU-ELS") + (load-file "../mel/MEL-ELS") + (load-file "TM-ELS") + (load-file "../tm-mh-e/TMH-ELS") + (load-file "../tm-mail/TMAIL-ELS") + (load-file "../tm-vm/TM-VM-ELS") + (princ (format "PREFIX=%s\tEXEC_PREFIX=%s\n" PREFIX EXEC_PREFIX)) + ) (defun make-mime-setup (tl-absolute-path tl-path mu-path mel-path tm-path) (let ((buf (find-file "mime-setup.el.in"))) @@ -49,6 +67,7 @@ )) (defun compile-tm () + (config-tm) (print load-path) (require 'mel-u) (require 'tm-edit) @@ -57,7 +76,7 @@ (make-mime-setup TL_DIR TL_RELATIVE_DIR MU_RELATIVE_DIR MEL_RELATIVE_DIR TM_KERNEL_RELATIVE_DIR) (compile-elisp-modules tl-modules "../tl") - (compile-elisp-modules mu-modules "../mu") + (compile-elisp-modules mu-modules-to-compile "../mu") (compile-elisp-modules mel-modules "../mel") (compile-elisp-modules tm-modules-to-compile ".") (compile-elisp-modules tm-mh-e-modules "../tm-mh-e") @@ -71,9 +90,12 @@ (load "../tm-gnus/TGNUS-ELS") (compile-elisp-modules tm-gnus-modules-to-compile "../tm-gnus") )) + (compile-elisp-modules tm-mail-modules "../tm-mail") + (compile-elisp-modules tm-vm-modules-to-compile "../tm-vm") ) (defun install-tm () + (config-tm) (princ (format "%s\n" emacs-version)) (print TL_DIR) (install-elisp-modules tl-modules "../tl" TL_DIR) @@ -92,10 +114,13 @@ (load "../tm-gnus/TGNUS-ELS") (install-elisp-modules tm-gnus-modules "../tm-gnus" TM_GNUS_DIR) )) + (install-elisp-modules tm-mail-modules "../tm-mail" TM_MAIL_DIR) + (install-elisp-modules tm-vm-modules "../tm-vm" TM_VM_DIR) (install-elisp-modules '(mime-setup) "." SETUP_FILE_DIR) ) (defun install-execs () + (config-tm) (install-files BINS BIN_SRC_DIR BIN_DIR) (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t) ) diff --git a/tm-edit.el b/tm-edit.el index a461ae2..3ff125c 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -6,7 +6,7 @@ ;; MORIOKA Tomohiko ;; Maintainer: MORIOKA Tomohiko ;; Created: 1994/08/21 renamed from mime.el -;; Version: $Revision: 7.82 $ +;; Version: $Revision: 7.83 $ ;; Keywords: mail, news, MIME, multimedia, multilingual ;; This file is part of tm (Tools for MIME). @@ -121,7 +121,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.82 1996/09/05 12:08:56 morioka Exp $") + "$Id: tm-edit.el,v 7.83 1996/09/07 17:09:09 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -2388,7 +2388,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (goto-char (point-min)) (while (re-search-forward mime-editor/split-blind-field-regexp nil t) (delete-region (match-beginning 0) - (1+ (rfc822/field-end))) + (1+ (std11-field-end))) ))) (while (< mime-editor/partial-number total) (erase-buffer) -- 1.7.10.4