From 5830bcc734c50f0ba421a0b8d7f4a1271e3145b0 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 16:41:11 +0000 Subject: [PATCH] tm 7.48.3. --- ChangeLog | 32 ++++++++++++++++++ Makefile | 2 +- TM-CFG | 90 ++++++++++++++++++++++++++++++++++++++++++--------- doc/tm-gnus_en.texi | 4 ++- doc/tm-gnus_ja.texi | 4 ++- doc/tm-mh-e_en.texi | 4 ++- doc/tm-mh-e_ja.texi | 4 ++- doc/tm_en.texi | 4 ++- doc/tm_ja.texi | 4 ++- gnus/ChangeLog | 15 +++++++++ gnus/Makefile | 2 +- gnus/tm-gd3.el | 11 ++++--- inst-tm | 25 +++++++++----- mime-setup.el.in | 13 +++++++- tm-bbdb.el | 6 ++-- 15 files changed, 181 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c47e30..2886ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +Thu Mar 28 08:42:34 1996 MORIOKA Tomohiko + + * tm: Version 7.48.3 was released. + * tm/gnus: Version 7.49.1 was released. + + * mime-setup.el.in: If `mime-setup-use-signature' is not nil, set + `message-signature' to nil. + + * mime-setup.el.in: setting for message.el. + +Wed Mar 27 23:06:07 1996 MORIOKA Tomohiko + + * doc/tm-mh-e_ja.texi, doc/tm-mh-e_en.texi: + Insert `This file documents ...' into @ifinfo. (cf. [tm-en:403]) + + * doc/tm-gnus_ja.texi, doc/tm-gnus_en.texi: + Insert `This file documents ...' into @ifinfo. (cf. [tm-en:403]) + + * doc/tm_ja.texi, doc/tm_en.texi: + Insert `This file documents ...' into @ifinfo. (cf. [tm-en:403]) + +Wed Mar 27 19:38:12 1996 MORIOKA Tomohiko + + * TM-CFG: rearrangement + +Tue Mar 26 08:07:24 1996 Pekka Marjola + + * tm-bbdb.el (tm-bbdb/update-record): In XEmacs, + mail-extract-address-components still doesn't handle nil argument. + (cf. [tm-ja:396]) + + Mon Mar 25 13:30:53 1996 MORIOKA Tomohiko * tl: Version 7.19 was released. diff --git a/Makefile b/Makefile index 9a43214..55b87d5 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els tl/*.el \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.48.2.tar.gz +TARFILE = tm7.48.3.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index b434a38..1290100 100644 --- a/TM-CFG +++ b/TM-CFG @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-CFG,v 2.0 1996/03/11 14:54:25 morioka Exp $ +;;; $Id: TM-CFG,v 3.0 1996/03/27 19:38:12 morioka Exp $ ;;; (setq load-path (append @@ -15,6 +15,9 @@ (require 'tl-misc) +;;; @ Please specify optional package directory if you use them. +;;; + ;; Please specify VM path. (add-path "vm-5.95beta/" 'all-paths) @@ -24,15 +27,79 @@ ;; Please specify BBDB path. (add-path "bbdb-1.50/" 'all-paths) + +;;; @ shell +;;; + ;; Please specify shell command path. (setq SHELL "/bin/sh") ;; Please specify shell command option. (setq SHELLOPTION "-c") + +;;; @ Please specify prefix of install directory. +;;; + ;; Please specify install path prefix. -(setq PREFIX "~/") -;;(setq PREFIX "/usr/local/") +;;(setq PREFIX "~/") ; install to you home directory +(setq PREFIX "/usr/local/") ; install to shared directory + +;; Please specify tm package prefix [optional] +(setq TM_PACKAGE_PREFIX "") + +;; Please specify tl prefix [optional] +;;(setq TL_PREFIX "tl/") +(setq TL_PREFIX + (if (string-match "XEmacs" emacs-version) + "tl/" + "")) + +;; Please specify MEL prefix [optional] +(setq MEL_PREFIX "mel/") + +;; Please specify tm prefix [optional] +(setq TM_PREFIX "tm/") + +;; lisp files of tm are installed into following directory tree: +;; +;; LISPDIR = PREFIX/DATA_PREFIX/LISP_PREFIX/ +;; LISPDIR/mime-setup.{el|elc} +;; LISPDIR/TM_PACKAGE_PREFIX/TL_PREFIX/ --- tl lisp files +;; LISPDIR/TM_PACKAGE_PREFIX/MEL_PREFIX/ --- MEL lisp files +;; LISPDIR/TM_PACKAGE_PREFIX/TM_PREFIX/ --- tm lisp files +;; +;; For example, if PREFIX = "/usr/local/" and you use Emacs 19.30, +;; +;; LISPDIR = /usr/local/share/emacs/site-lisp/ +;; /usr/local/share/emacs/site-lisp/mime-setup.{el|elc} +;; /usr/local/share/emacs/site-lisp/ --- tl lisp files +;; /usr/local/share/emacs/site-lisp/mel/ --- MEL lisp files +;; /usr/local/share/emacs/site-lisp/tm/ --- tm lisp files +;; +;; For example, if PREFIX = "~/" and you use XEmacs, +;; +;; LISPDIR = ~/share/xemacs/site-lisp/ +;; ~/share/xemacs/site-lisp/mime-setup.{el|elc} +;; ~/share/xemacs/site-lisp/tl/ --- tl lisp files +;; ~/share/xemacs/site-lisp/mel/ --- MEL lisp files +;; ~/share/xemacs/site-lisp/tm/ --- tm lisp files + + +;;; @ executables +;;; + +;; Please specify binary path. +(defvar BIN_DIR (expand-file-name "bin/" PREFIX)) + +;; Please specify binary path. (for external method scripts) +(setq METHOD_DIR BIN_DIR) + + + + +;;; @ optional settings +;;; (setq EMACS_PREFIX (cond ((boundp 'NEMACS) "nemacs/") @@ -64,13 +131,11 @@ (setq SETUP_FILE_DIR LISPDIR) -(setq TM_PREFIX "") - -(setq TM_LISPDIR (expand-file-name TM_PREFIX LISPDIR)) +(setq TM_LISPDIR (expand-file-name TM_PACKAGE_PREFIX LISPDIR)) -(setq TL_DIR (expand-file-name "tl/" TM_LISPDIR)) -(setq MEL_DIR (expand-file-name "mel/" TM_LISPDIR)) -(setq TM_KERNEL_DIR (expand-file-name "tm/" TM_LISPDIR)) +(setq TL_DIR (expand-file-name TL_PREFIX TM_LISPDIR)) +(setq MEL_DIR (expand-file-name MEL_PREFIX TM_LISPDIR)) +(setq TM_KERNEL_DIR (expand-file-name TM_PREFIX TM_LISPDIR)) (setq TM_MHE_DIR TM_KERNEL_DIR) (setq TM_GNUS_DIR TM_KERNEL_DIR) @@ -86,10 +151,3 @@ (setq METHODS '("tm-au" "tm-file" "tm-html" "tm-image" "tm-mpeg" "tm-plain" "tmdecode")) - - -;; Please specify binary path. -(defvar BIN_DIR (expand-file-name "bin/" PREFIX)) - -;; Please specify binary path. -(setq METHOD_DIR BIN_DIR) diff --git a/doc/tm-gnus_en.texi b/doc/tm-gnus_en.texi index 2aa5b33..62f0490 100644 --- a/doc/tm-gnus_en.texi +++ b/doc/tm-gnus_en.texi @@ -6,13 +6,15 @@ @titlepage @title{tm-gnus} @author{MORIOKA Tomohiko} -@code{$Id: tm-gnus_en.texi,v 5.1 1995/12/21 10:39:45 morioka Exp morioka $} +@code{$Id: tm-gnus_en.texi,v 6.0 1996/03/27 23:04:30 morioka Exp morioka $} @end titlepage @node Top, Introduction, (tm_en.info)tm-MUA, (tm_en.info)tm-MUA @comment node-name, next, previous, up @ifinfo +This file documents tm-gnus, a MIME extension for GNUS and Gnus. + @top tm-gnus 7.25 Reference manual @end ifinfo diff --git a/doc/tm-gnus_ja.texi b/doc/tm-gnus_ja.texi index 58b549f..abe8a75 100644 --- a/doc/tm-gnus_ja.texi +++ b/doc/tm-gnus_ja.texi @@ -6,13 +6,15 @@ @titlepage @title{tm-gnus} @author{¼é²¬ ÃÎɧ} -@code{$Id: tm-gnus_ja.texi,v 4.1 1995/12/18 12:04:38 morioka Exp morioka $} +@code{$Id: tm-gnus_ja.texi,v 6.0 1996/03/27 23:04:01 morioka Exp morioka $} @end titlepage @node Top, Introduction, (tm_ja.info)tm-MUA, (tm_ja.info)tm-MUA @comment node-name, next, previous, up @ifinfo +This file documents tm-gnus, a MIME extension for GNUS and Gnus. + @top tm-gnus 7.25 Reference manual @end ifinfo diff --git a/doc/tm-mh-e_en.texi b/doc/tm-mh-e_en.texi index 26f973c..6d13e1a 100644 --- a/doc/tm-mh-e_en.texi +++ b/doc/tm-mh-e_en.texi @@ -6,13 +6,15 @@ @titlepage @title{tm-mh-e} @author{MORIOKA Tomohiko} -@code{$Id: tm-mh-e_en.texi,v 3.1 1995/12/21 10:40:49 morioka Exp morioka $} +@code{$Id: tm-mh-e_en.texi,v 4.0 1996/03/27 23:05:17 morioka Exp morioka $} @end titlepage @node Top, Introduction, (tm_en.info)tm-MUA, (tm_en.info)tm-MUA @comment node-name, next, previous, up @ifinfo +This file documents tm-mh-e, a MIME extension for mh-e. + @top tm-mh-e 7.44 Reference manual @end ifinfo diff --git a/doc/tm-mh-e_ja.texi b/doc/tm-mh-e_ja.texi index e3c45e3..1cc83e0 100644 --- a/doc/tm-mh-e_ja.texi +++ b/doc/tm-mh-e_ja.texi @@ -6,13 +6,15 @@ @titlepage @title{tm-mh-e} @author{¼é²¬ ÃÎɧ} -@code{$Id: tm-mh-e_ja.texi,v 2.0 1995/12/13 06:24:12 morioka Exp morioka $} +@code{$Id: tm-mh-e_ja.texi,v 3.0 1996/03/27 23:06:07 morioka Exp morioka $} @end titlepage @node Top, Introduction, (tm_ja.info)tm-MUA, (tm_ja.info)tm-MUA @comment node-name, next, previous, up @ifinfo +This file documents tm-mh-e, a MIME extension for mh-e. + @top tm-mh-e 7.44 Reference manual @end ifinfo diff --git a/doc/tm_en.texi b/doc/tm_en.texi index 39234eb..acc72cd 100644 --- a/doc/tm_en.texi +++ b/doc/tm_en.texi @@ -6,13 +6,15 @@ @titlepage @title tm Manual (English Version) @author by MORIOKA Tomohiko -@code{$Id: tm_en.texi,v 7.11 1996/02/28 14:33:50 morioka Exp morioka $} +@code{$Id: tm_en.texi,v 7.12 1996/03/27 22:58:47 morioka Exp morioka $} @end titlepage @node Top, Introduction, (dir), (dir) @comment node-name, next, previous, up @ifinfo +This file documents tm, a MIME package for GNU Emacs. + @top tm 7.32 Reference manual @end ifinfo diff --git a/doc/tm_ja.texi b/doc/tm_ja.texi index 518efb0..cb12ba6 100644 --- a/doc/tm_ja.texi +++ b/doc/tm_ja.texi @@ -6,13 +6,15 @@ @titlepage @title{tm Manual¡ÊÆüËܸìÈÇ¡Ë} @author{¼é²¬ ÃÎɧ Ãø} -@code{$Id: tm_ja.texi,v 7.5 1995/12/23 09:41:52 morioka Exp morioka $} +@code{$Id: tm_ja.texi,v 7.6 1996/03/27 22:59:32 morioka Exp morioka $} @end titlepage @node Top, Introduction, (dir), (dir) @comment node-name, next, previous, up @ifinfo +This file documents tm, a MIME package for GNU Emacs. + @top tm 7.32 Reference manual GNU Emacs ¤Ç MIME ¤ò³Ú¤·¤à¤¿¤á¤Î package ¤Ç¤¢¤ë `tm' ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ diff --git a/gnus/ChangeLog b/gnus/ChangeLog index d86e914..76c4c15 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,18 @@ +Thu Mar 28 08:44:31 1996 MORIOKA Tomohiko + + * tm/gnus: Version 7.49.1 was released. + +Wed Mar 27 19:27:04 1996 MORIOKA Tomohiko + + * tm-gd3.el (tm-gnus/article-set-mode-line): + Function `rightful-boundary-short-string' was obsoleted; + use function `truncate-string'. + +Mon Mar 4 09:29:33 1996 MORIOKA Tomohiko + + * Makefile: makefile variables `FILES' was modified. + + Mon Mar 4 08:20:48 1996 Morioka Tomohiko * tm/gnus: Version 7.49 was released. diff --git a/gnus/Makefile b/gnus/Makefile index fd440bf..6784810 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.49.tar +TARFILE = tm-gnus7.49.1.tar gnus: diff --git a/gnus/tm-gd3.el b/gnus/tm-gd3.el index 3bee1d2..9ed7ff0 100644 --- a/gnus/tm-gd3.el +++ b/gnus/tm-gd3.el @@ -8,7 +8,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/05/23 (obsolete tm-ognus.el) ;;; Version: -;;; $Id: tm-gd3.el,v 7.5 1995/11/21 02:49:25 morioka Exp $ +;;; $Id: tm-gd3.el,v 7.6 1996/03/27 19:27:04 morioka Exp $ ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -26,6 +26,8 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with This program. If not, write to the Free Software ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;;; +;;; Code: (require 'tm-ew-d) @@ -53,9 +55,8 @@ If you don't like it, define your own gnus-article-set-mode-line." gnus-newsgroup-name (if gnus-current-article (format "/%d" gnus-current-article) "") - (rightful-boundary-short-string subject - (min (string-width subject) - maxlen)) + (truncate-string subject + (min (string-width subject) maxlen)) (if (> (string-width subject) maxlen) "..." "") (make-string (max 0 (- 17 (string-width subject))) ? ) ))) @@ -80,3 +81,5 @@ If you don't like it, define your own gnus-article-set-mode-line." ;;; (provide 'tm-gd3) + +;;; tm-gd3.el ends here diff --git a/inst-tm b/inst-tm index a30468a..ec3813e 100644 --- a/inst-tm +++ b/inst-tm @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 3.1 1996/03/11 14:50:53 morioka Exp $ +;;; $Id: inst-tm,v 3.1 1996/03/11 14:50:53 morioka Exp morioka $ ;;; (load-file "TM-CFG") @@ -14,19 +14,28 @@ (goto-char (point-min)) (re-search-forward "^;;; Code:" nil t) (setq buffer-read-only nil) - (insert - (format - " + (if (member tl-path default-load-path) + (insert " + +\(require \'tl-misc)") + (insert + (format " \(let ((load-path (cons \"%s\" load-path))) (require \'tl-misc) ) -\(add-path \"%s\") -\(add-path \"%s\") -\(add-path \"%s\")" - tl-path tl-path mel-path tm-path)) +\(add-path \"%s\")" tl-path tl-path)) + ) + (or (member mel-path default-load-path) + (insert + (format " +\(add-path \"%s\")" mel-path))) + (or (member tm-path default-load-path) + (insert + (format " +\(add-path \"%s\")" tm-path))) (write-file "mime-setup.el") )) diff --git a/mime-setup.el.in b/mime-setup.el.in index 816c708..de6ab66 100644 --- a/mime-setup.el.in +++ b/mime-setup.el.in @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: mime-setup.el,v 7.14 1996/02/14 09:15:36 morioka Exp $ +;;; $Id: mime-setup.el.in,v 7.16 1996/03/28 08:42:34 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -77,6 +77,7 @@ (add-hook 'mime/editor-mode-hook 'mime-setup-set-signature-key) (setq gnus-signature-file nil) (setq mail-signature nil) + (setq message-signature nil) )) @@ -124,6 +125,13 @@ (add-hook 'news-inews-hook 'mime-editor/maybe-translate) +;;; @ for message (September Gnus 0.58 or later) +;;; + +(add-hook 'message-setup-hook 'mime/editor-mode) +(add-hook 'message-send-hook 'mime-editor/maybe-translate) + + ;;; @ end ;;; @@ -132,3 +140,6 @@ (run-hooks 'mime-setup-load-hook) ;;; mime-setup.el ends here +;;; +;;; Local Variables: +;;; mode: emacs-lisp diff --git a/tm-bbdb.el b/tm-bbdb.el index 023ac84..393e459 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -6,8 +6,9 @@ ;;; ;;; Author: KOBAYASHI Shuhei ;;; Artur Pioro +;;; modified by Pekka Marjola ;;; Maintainer: MORIOKA Tomohiko -;;; Version: $Id: tm-bbdb.el,v 7.2 1996/03/14 13:41:48 morioka Exp $ +;;; Version: $Id: tm-bbdb.el,v 7.4 1996/03/26 09:17:37 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB ;;; ;;; This file is part of tm (Tools for MIME). @@ -129,7 +130,8 @@ the user confirms the creation." (if bbdb-use-pop-up (tm-bbdb/pop-up-bbdb-buffer offer-to-create) (let* ((from (rfc822/get-field-body "From")) - (addr (car (cdr (mail-extract-address-components from))))) + (addr (if from + (car (cdr (mail-extract-address-components from)))))) (if (or (null from) (null addr) (string-match (bbdb-user-mail-names) addr)) -- 1.7.10.4