From: morioka Date: Tue, 10 Mar 1998 07:02:00 +0000 (+0000) Subject: tm 7.96. X-Git-Tag: tm-7_96~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d351266b0a31eae106f92cd5b25d6a3142833da;p=elisp%2Ftm.git tm 7.96. --- diff --git a/ChangeLog b/ChangeLog index 6e1f5b9..dda1ee7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,70 @@ +Tue Dec 10 14:24:23 1996 MORIOKA Tomohiko + + * emu: Version 7.37.1 was released. + * MU: Version 0.36 was released. + * tm: Version 7.96 was released. + * gnus-mime: Version 0.12.2 was released. + * tm-mh-e: Version 7.72 was released. + * tm-vm: Version 7.78 was released. + * tm-mail: Version 7.27 was released. + + * tm-bbdb.el: Use `eval-when-compile' if bbdb-com is not found. + +Tue Dec 10 11:48:04 1996 Shuhei KOBAYASHI + + * tm-bbdb.el: Use `module-installed-p' instead of `eval-when'. + + * tm-bbdb.el (bbdb-pop-up-elided-display): New macro; imported + from bbdb-1.51. + (bbdb-user-mail-names): Ditto. Can byte-compile without BBDB. + +Tue Dec 10 11:41:22 1996 MORIOKA Tomohiko + + * tm-setup.el: Don't set up tm-rmail for XEmacs/mule. + +Tue Dec 10 08:29:42 1996 MORIOKA Tomohiko + + * TM-ELS: Add tm-edit-tipgp.el. + +Tue Dec 10 06:28:34 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor::edit-again): folding for parameters of + Content-Type field. + +Tue Dec 10 01:02:12 1996 Shuhei KOBAYASHI + + * tm-bbdb.el (tm-bbdb/use-mail-extr): Doc strings was modified. + (tm-bbdb/delete-empty-window): More doc strings. + +Mon Dec 9 04:23:40 1996 Shuhei KOBAYASHI + + * tm-bbdb.el (tm-bbdb/use-mail-extr): Doc strings was added. + (tm-bbdb/auto-create-p): Ditto. + (tm-bbdb/delete-empty-window): New variable. + (tm-bbdb/pop-up-bbdb-buffer): Delete empty window if + `tm-bbdb/delete-empty-window' is non-nil. + +Sat Dec 7 09:17:01 1996 MORIOKA Tomohiko + + * TM-MK (make-mime-setup): Generate variable + `mime-viewer/external-progs' related code. + + * tm-play.el: Variable `mime-viewer/external-progs' was abolished + (Related coded were moved to mime-setup.el if it is required). + +Sat Dec 7 08:14:03 1996 MORIOKA Tomohiko + + * TM-MK (update-xemacs-source): New function. + +Thu Dec 5 12:17:54 1996 MORIOKA Tomohiko + + * tm-view.el (mime-viewer/following-required-fields-list): New + variable. + (mime-viewer/follow-content): Insert fields of mother-buffer + specified in variable `mime-viewer/following-required-fields-list' + if it is not found in preview-buffer. + + Wed Dec 4 05:42:36 1996 MORIOKA Tomohiko * emu: Version 7.37 was released. @@ -9,6 +76,10 @@ Wed Dec 4 05:42:36 1996 MORIOKA Tomohiko * gnus-mime: Version 0.12.1 was released. * sinfo: Version 3.3 was released. + * TM-MK (directory=): New function. + (make-mime-setup): Use function `MEMBER' with function + `directory=' instead of function `member'. + Wed Dec 4 05:32:48 1996 MORIOKA Tomohiko * Makefile: Add bitmap-mule/. diff --git a/Makefile b/Makefile index 909bc54..ce08fd1 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # -# $Id: Makefile,v 7.40 1996/12/04 05:42:36 morioka Exp morioka $ +# $Id: Makefile,v 7.42 1996/12/10 14:57:42 morioka Exp morioka $ # -VERSION = 7.95 +VERSION = 7.96 SHELL = /bin/sh MAKE = make @@ -42,7 +42,7 @@ TM_FILES = tm/README.en tm/ChangeLog \ TM_MH_E_FILES = tm-mh-e/Makefile tm-mh-e/mk-tmh tm-mh-e/TMH-ELS \ tm-mh-e/*.el tm-mh-e/ChangeLog \ - tm-mh-e/*.ol tm-mh-e/*.texi tm-mh-e/*.info tm-mh-e/*.tex + tm-mh-e/*.sgml tm-mh-e/*.texi tm-mh-e/*.info GNUS_MIME_FILES = gnus-mime/Makefile gnus-mime/*-path \ gnus-mime/Gnus-MIME-* gnus-mime/*.el \ @@ -65,7 +65,7 @@ MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/MEL-ELS mel/ChangeLog MU_FILES = mu/MU-ELS mu/*.el mu/ChangeLog TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/TL-ELS \ - tl/*.el tl/doc/*.ol tl/doc/*.tex tl/doc/*.texi tl/ChangeLog + tl/*.el tl/ChangeLog BITMAP_FILES = bitmap-mule/BITMAP-* bitmap-mule/Makefile \ bitmap-mule/*.el bitmap-mule/*.bdf \ @@ -110,6 +110,10 @@ install: $(UTILS) methods install-elc $(EMACS) $(FLAGS) -l TM-MK -f install-execs $(PREFIX) $(EXEC_PREFIX) +update-xemacs: + $(EMACS) $(FLAGS) -l TM-MK -f update-xemacs-source + + clean: -$(RM) $(GOMI) -cd doc; $(MAKE) clean diff --git a/TM-ELS b/TM-ELS index 04e65c2..475c24f 100644 --- a/TM-ELS +++ b/TM-ELS @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-ELS,v 7.4 1996/09/17 04:39:33 morioka Exp morioka $ +;;; $Id: TM-ELS,v 7.5 1996/12/10 08:29:42 morioka Exp $ ;;; (setq tm-modules-to-compile @@ -28,6 +28,7 @@ '((ange-ftp tm-ftp) (mailcrypt tm-pgp tm-edit-mc) (bbdb tm-bbdb) + (tinypgpa tm-edit-tipgp) )) (if (and (file-exists-p "tm-evs.el") diff --git a/TM-MK b/TM-MK index 36c4f07..903b4c9 100644 --- a/TM-MK +++ b/TM-MK @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-MK,v 7.43 1996/11/27 11:48:53 morioka Exp morioka $ +;;; $Id: TM-MK,v 7.46 1996/12/07 09:17:01 morioka Exp morioka $ ;;; (defun config-tm () @@ -89,7 +89,20 @@ ;; generate tm external-methods path setting (or (string= METHOD_DIR exec-directory) (insert - (format "\n(defvar mime-viewer/external-progs %s)" + (format "\n +(defvar mime-viewer/external-progs%s + \"*Directory containing tm external methods.\") + +(add-to-list 'exec-path mime-viewer/external-progs) + +(let ((paths (parse-colon-path (getenv \"PATH\")))) + (or (member mime-viewer/external-progs paths) + (setenv \"PATH\" + (mapconcat (function identity) + (append paths (list mime-viewer/external-progs)) + path-separator)) + )) +" (let ((dir (file-relative-name METHOD_DIR data-directory))) (if (< (length dir) (length METHOD_DIR)) (concat "\n (expand-file-name \"" @@ -99,7 +112,7 @@ (if (< (length dir) (length METHOD_DIR)) (concat "\n (expand-file-name \"~/" dir "\")") - (concat "\"" METHOD_DIR "\"") + (concat " \"" METHOD_DIR "\"") ))) )) ) @@ -170,4 +183,99 @@ (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t) ) + +(defun update-xemacs-source () + (setq LISPDIR (expand-file-name "../lisp" data-directory)) + (load-file "TM-CFG") + (setq EMU_DIR TL_DIR) + (setq SETUP_FILE_DIR TM_KERNEL_DIR) + (load-file "../emu/EMU-ELS") + (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") + + (copy-file "mime-setup.el.in" "mime-setup.el" t t) + (set-file-modes "mime-setup.el" (+ (* 6 64) (* 4 8) 4)) + (compile-elisp-modules emu-modules "../emu") + (compile-elisp-modules tl-modules "../tl") + (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") + (compile-elisp-module 'mime-setup ".") + (require 'gnus) + (load "../gnus-mime/Gnus-MIME-ELS") + (compile-elisp-modules gnus-mime-modules-to-compile "../gnus-mime") + (compile-elisp-modules tm-mail-modules "../tm-mail") + (compile-elisp-modules tm-vm-modules-to-compile "../tm-vm") + + (install-elisp-modules emu-modules "../emu" EMU_DIR) + (install-elisp-modules tl-modules "../tl" TL_DIR) + (install-elisp-modules mu-modules "../mu" MU_DIR) + (install-elisp-modules mel-modules "../mel" MEL_DIR) + (install-elisp-modules tm-modules "." TM_KERNEL_DIR) + (install-elisp-modules tm-mh-e-modules "../tm-mh-e" TM_MHE_DIR) + (install-elisp-modules gnus-mime-modules "../gnus-mime" Gnus_MIME_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) + + (setq METHOD_DIR (expand-file-name "../lib-src" data-directory)) + (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t) + + (install-file "sinfo.dtd" "../sinfo" + (expand-file-name "../etc/sgml" data-directory) + nil t) + + (install-files '("tm-edit-en.sgml" "tm-edit-en.texi" + "tm-edit-ja.sgml" "tm-edit-ja.texi" + "tm-en.sgml" "tm-en.texi" + "tm-ja.sgml" "tm-ja.texi" + "tm-view-en.sgml" "tm-view-en.texi" + "tm-view-ja.sgml" "tm-view-ja.texi" + ) + "doc" + (expand-file-name "../man/tm" data-directory) + nil t) + (install-files '("tm-edit-en.info" "tm-edit-ja.info" + "tm-en.info" "tm-ja.info" + "tm-view-en.info" "tm-view-ja.info" + ) + "doc" + (expand-file-name "../info" data-directory) + nil t) + (install-files '("gnus-mime-en.sgml" "gnus-mime-en.texi" + "gnus-mime-ja.sgml" "gnus-mime-ja.texi" + ) + "../gnus-mime" + (expand-file-name "../man/tm" data-directory) + nil t) + (install-files '("gnus-mime-en.info" "gnus-mime-ja.info") + "../gnus-mime" + (expand-file-name "../info" data-directory) + nil t) + (install-files '("tm-mh-e-en.sgml" "tm-mh-e-en.texi" + "tm-mh-e-ja.sgml" "tm-mh-e-ja.texi" + ) + "../tm-mh-e" + (expand-file-name "../man/tm" data-directory) + nil t) + (install-files '("tm-mh-e-en.info" "tm-mh-e-ja.info") + "../tm-mh-e" + (expand-file-name "../info" data-directory) + nil t) + (install-files '("tm-vm_en.texi") + "../tm-vm" + (expand-file-name "../man/tm" data-directory) + nil t) + (install-files '("tm-vm_en.info") + "../tm-vm" + (expand-file-name "../info" data-directory) + nil t) + ) + ;;; TM-MK ends here diff --git a/tm-bbdb.el b/tm-bbdb.el index e07e816..06ea9ef 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -6,7 +6,7 @@ ;; Author: Shuhei KOBAYASHI ;; Artur Pioro ;; Maintainer: Shuhei KOBAYASHI -;; Version: $Id: tm-bbdb.el,v 7.22 1996/11/30 18:40:09 shuhei-k Exp $ +;; Version: $Id: tm-bbdb.el,v 7.27 1996/12/10 14:24:23 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB ;; This file is part of tm (Tools for MIME). @@ -31,12 +31,46 @@ (require 'std11) (require 'tm-ew-d) (require 'tm-view) -(require 'bbdb-com) ; (require 'bbdb) implicitly +(if (module-installed-p 'bbdb-com) + (require 'bbdb-com) + (eval-when-compile + ;; imported from bbdb-1.51 + (defmacro bbdb-pop-up-elided-display () + '(if (boundp 'bbdb-pop-up-elided-display) + bbdb-pop-up-elided-display + bbdb-elided-display)) + (defmacro bbdb-user-mail-names () + "Returns a regexp matching the address of the logged-in user" + '(or bbdb-user-mail-names + (setq bbdb-user-mail-names + (concat "\\b" (regexp-quote (user-login-name)) "\\b")))) + )) -;;; @ mail-extr + +;;; @ User Variables ;;; -(defvar tm-bbdb/use-mail-extr t) +(defvar tm-bbdb/use-mail-extr t + "*If non-nil, `mail-extract-address-components' is used. +Otherwise `tm-bbdb/extract-address-components' overrides it.") + +(defvar tm-bbdb/auto-create-p nil + "*If t, create new BBDB records automatically. +If function, then it is called with no arguments to decide whether an +entry should be automatically creaded. + +tm-bbdb uses this variable instead of `bbdb/mail-auto-create-p' or +`bbdb/news-auto-create-p' unless other tm-MUA overrides it.") + +(defvar tm-bbdb/delete-empty-window nil + "*If non-nil, delete empty BBDB window. +All bbdb-MUAs but bbdb-gnus display BBDB window even if it is empty. +If you prefer behavior of bbdb-gnus, set this variable to t. + +For framepop users: If empty, `framepop-banish' is used instead.") + +;;; @ mail-extr +;;; (defun tm-bbdb/extract-address-components (str) (let* ((ret (std11-extract-address-components str)) @@ -116,8 +150,6 @@ ;;; @ BBDB functions for mime/viewer-mode ;;; -(defvar tm-bbdb/auto-create-p nil) - (defun tm-bbdb/update-record (&optional offer-to-create) "Return the record corresponding to the current MIME previewing message. Creating or modifying it as necessary. A record will be created if @@ -196,7 +228,10 @@ displaying the record corresponding to the sender of the current message." (if record (bbdb-display-records (list record)) (framepop-banish)) - (bbdb-display-records (if record (list record) nil))) + (bbdb-display-records (if record (list record) nil)) + (if (and (null record) + tm-bbdb/delete-empty-window) + (delete-windows-on (get-buffer "*BBDB*")))) (set-buffer b) record)))) diff --git a/tm-edit.el b/tm-edit.el index 15185ca..a032c4f 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.95 $ +;; Version: $Revision: 7.96 $ ;; 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.95 1996/12/04 04:43:01 morioka Exp $") + "$Id: tm-edit.el,v 7.96 1996/12/10 06:28:34 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -2479,18 +2479,27 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (t (let* (charset (pstr - (mapconcat (function - (lambda (attr) - (if (string-equal (car attr) - "charset") - (progn - (setq charset (cdr attr)) - "") - (concat ";" (car attr) - "=" (cdr attr)) - ) - )) - params "")) + (let ((bytes (+ 14 (length ctype)))) + (mapconcat (function + (lambda (attr) + (if (string-equal (car attr) "charset") + (progn + (setq charset (cdr attr)) + "") + (let* ((str + (concat (car attr) + "=" (cdr attr)) + ) + (bs (length str)) + ) + (setq bytes (+ bytes bs 2)) + (if (< bytes 76) + (concat "; " str) + (setq bytes (+ bs 1)) + (concat ";\n " str) + ) + )))) + params ""))) encoding encoded) (save-excursion diff --git a/tm-play.el b/tm-play.el index f3b3368..53b7172 100644 --- a/tm-play.el +++ b/tm-play.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1995/9/26 (separated from tm-view.el) -;; Version: $Id: tm-play.el,v 7.32 1996/10/23 02:49:37 morioka Exp $ +;; Version: $Id: tm-play.el,v 7.33 1996/12/07 08:26:26 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia ;; This file is part of tm (Tools for MIME). @@ -28,19 +28,6 @@ (require 'tm-view) -(defvar mime-viewer/external-progs "/usr/local/share/tm" - "*Directory containing tm external methods.") - -(add-to-list 'exec-path mime-viewer/external-progs) - -(let ((paths (parse-colon-path (getenv "PATH")))) - (or (member mime-viewer/external-progs paths) - (setenv "PATH" - (mapconcat (function identity) - (append paths (list mime-viewer/external-progs)) - path-separator)) - )) - ;;; @ content decoder ;;; diff --git a/tm-setup.el b/tm-setup.el index f34590c..9aaf7c5 100644 --- a/tm-setup.el +++ b/tm-setup.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: tm-setup.el,v 7.7 1996/08/31 14:39:06 morioka Exp $ +;; Version: $Id: tm-setup.el,v 7.8 1996/12/10 11:41:22 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word ;; This file is part of tm (Tools for MIME). @@ -85,12 +85,14 @@ ;;; @ for RMAIL ;;; -(call-after-loaded 'rmail - (function - (lambda () - (require 'tm-rmail) - )) - 'rmail-mode-hook) +(or running-xemacs-with-mule + (call-after-loaded 'rmail + (function + (lambda () + (require 'tm-rmail) + )) + 'rmail-mode-hook) + ) ;;; @ for mh-e diff --git a/tm-view.el b/tm-view.el index e1c6415..efa6c62 100644 --- a/tm-view.el +++ b/tm-view.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;; Version: $Revision: 7.77 $ +;; Version: $Revision: 7.78 $ ;; Keywords: mail, news, MIME, multimedia ;; This file is part of tm (Tools for MIME). @@ -42,7 +42,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.77 1996/09/23 13:15:09 morioka Exp $") + "$Id: tm-view.el,v 7.78 1996/12/05 12:17:54 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -380,6 +380,9 @@ Each elements are regexp of field-name. [tm-view.el]") (defvar mime-viewer/following-method-alist nil) +(defvar mime-viewer/following-required-fields-list + '("From")) + ;;; @@ X-Face ;;; @@ -981,6 +984,24 @@ button-2 Move to point under the mouse cursor rcnum (cdr rcnum)) ) ) + (let ((rest mime-viewer/following-required-fields-list)) + (while rest + (let ((field-name (car rest))) + (or (std11-field-body field-name) + (insert + (format + (concat field-name + ": " + (save-excursion + (set-buffer the-buf) + (set-buffer mime::preview/mother-buffer) + (set-buffer mime::preview/article-buffer) + (std11-field-body field-name) + ) + "\n"))) + )) + (setq rest (cdr rest)) + )) (mime/decode-message-header) ) (funcall (cdr (assq mode mime-viewer/following-method-alist))