From 29e661110079bf0d047d34fa64f7a963d06b7522 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 10 Mar 1998 04:41:12 +0000 Subject: [PATCH] tm 7.81. --- ChangeLog | 81 ++++++++++++++++++++++++++++++++++++++++++ Makefile | 10 +++--- TM-CFG | 46 ++++++++++++++++++++++-- gnus/ChangeLog | 20 +++++++++++ gnus/gnus-sum-mime.el | 39 +++++++++++---------- gnus/mk-tgnus | 93 ++++++++++++++++++------------------------------- inst-tm | 50 ++++++++++++++------------ mh-e/ChangeLog | 7 ++++ mh-e/mk-tmh | 4 +-- mh-e/tmh-comp.el | 58 +++++++++++++++--------------- tm-bbdb.el | 6 ++-- tm-edit.el | 10 +++--- 12 files changed, 277 insertions(+), 147 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3aa37e7..816933a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,84 @@ +Tue Sep 3 15:32:35 1996 MORIOKA Tomohiko + + * tl: Version 7.61.1 was released. + * MU: Version 0.27 was released. + * tm: Version 7.81 was released. + * tm/mh-e: Version 7.68.1 was released. + * tm/gnus: gnus-mime Version 0.6.1 was released. + + * Makefile: add MU package. + +Mon Sep 2 16:42:24 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/make-encrypt-recipient-header): Use + function `std11-field-bodies' instead of + `rfc822/get-field-bodies'. + (mime-editor/inserted-message-filter): Use function + `std11-field-end' instead of `rfc822/field-end'. + +Mon Sep 2 16:30:37 1996 MORIOKA Tomohiko + + * tm-bbdb.el: Use std11.el instead of tl-822.el. + + * tm-bbdb.el (tm-bbdb/extract-address-components): Use function + `std11-extract-address-components' instead of + `rfc822/extract-address-components'. + + * inst-tm (compile-tm): compile MU modules. + (install-tm): install MU modules. + + * TM-CFG (LISPDIR): Use `running-emacs-19_29-or-later' instead of + `running-emacs-19'. + +Mon Sep 2 15:23:44 1996 MORIOKA Tomohiko + + * TM-CFG: fixed problem about home relative paths. + + * TM-CFG (TM_MHE_RELATIVE_DIR, TM_GNUS_RELATIVE_DIR): fixed. + +Mon Sep 2 15:08:00 1996 MORIOKA Tomohiko + + * TM-CFG: add "../mu" to load-path. + + * TM-CFG: fixed problem about TM_KERNEL_RELATIVE_DIR. + +Mon Sep 2 14:55:51 1996 MORIOKA Tomohiko + + * TM-CFG: fixed problem about *_RELATIVE_DIR when `LISPDIR' is a + member of `default-load-path'. + + * inst-tm (make-mime-setup): New argument `tl-absolute-path'. + (compile-tm): Use variable `TL_DIR' as argument of function + `make-mime-setup'. + +Mon Sep 2 14:39:36 1996 MORIOKA Tomohiko + + * inst-tm (compile-tm): Use variable `TL_RELATIVE_DIR', + `MU_RELATIVE_DIR', `MEL_RELATIVE_DIR' and `TM_KERNEL_RELATIVE_DIR' + as argument of function `make-mime-setup'. + + * TM-CFG (TL_RELATIVE_DIR, MU_RELATIVE_DIR, MEL_RELATIVE_DIR, + TM_KERNEL_RELATIVE_DIR, TM_MHE_DIR, TM_GNUS_DIR): New variable. + +Mon Sep 2 14:07:47 1996 MORIOKA Tomohiko + + * inst-tm (make-mime-setup): New argument `mu-path'; generate MU + setting. + (compile-tm): Use variable `MU_DIR'; generate MU setting. + + * TM-CFG (MU_PREFIX, MU_DIR): New variable. + + * inst-tm (install-tm): Use function `install-elisp-modules' for + mime-setup.el. + +Mon Sep 2 13:25:42 1996 MORIOKA Tomohiko + + * inst-tm: Function `install-el-and-elc-files' was abolished. + + * inst-tm (install-tm): Use function `install-elisp-modules' for + tl. + + Sat Aug 31 14:39:06 1996 MORIOKA Tomohiko * tl: Version 7.61 was released. diff --git a/Makefile b/Makefile index e857854..7d35a1b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 7.25 1996/08/23 07:41:35 morioka Exp morioka $ +# $Id: Makefile,v 7.26 1996/09/03 15:32:35 morioka Exp $ # SHELL = /bin/sh @@ -42,13 +42,15 @@ TM_MUA_FILES = tm/tm-rmail.el tm/tm-vm.el tm/tm-mail.el \ MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/MEL-ELS mel/ChangeLog +MU_FILES = mu/*.el mu/MU-ELS mu/ChangeLog + TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/TL-ELS \ tl/*.el tl/*.bdf \ - tl/doc/*.ol tl/doc/*.tex tl/ChangeLog + tl/doc/*.ol tl/doc/*.tex tl/doc/*.texi tl/ChangeLog -FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) +FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(MU_FILES) $(TL_FILES) -TARFILE = tm7.80.tar.gz +TARFILE = tm7.81.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index 31ead77..3f14b7a 100644 --- a/TM-CFG +++ b/TM-CFG @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-CFG,v 7.2 1996/08/16 03:55:42 morioka Exp morioka $ +;;; $Id: TM-CFG,v 7.10 1996/09/02 15:25:45 morioka Exp morioka $ ;;; (defvar default-load-path load-path) @@ -9,7 +9,7 @@ (lambda (path) (expand-file-name path (getenv "PWD")) )) - '("." "../tl" "../mel" "mh-e") + '("." "../tl" "../mu" "../mel" "mh-e") ) load-path)) @@ -68,6 +68,9 @@ "tl" "")) +;; Please specify MU prefix [optional] +(setq MU_PREFIX "mu") + ;; Please specify MEL prefix [optional] (setq MEL_PREFIX "mel") @@ -79,6 +82,7 @@ ;; LISPDIR = PREFIX/DATA_PREFIX/LISP_PREFIX/ ;; LISPDIR/mime-setup.{el|elc} ;; LISPDIR/TM_PACKAGE_PREFIX/TL_PREFIX/ --- tl lisp files +;; LISPDIR/TM_PACKAGE_PREFIX/MU_PREFIX/ --- MU lisp files ;; LISPDIR/TM_PACKAGE_PREFIX/MEL_PREFIX/ --- MEL lisp files ;; LISPDIR/TM_PACKAGE_PREFIX/TM_PREFIX/ --- tm lisp files ;; @@ -87,6 +91,7 @@ ;; 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/mu/ --- MU lisp files ;; /usr/local/share/emacs/site-lisp/mel/ --- MEL lisp files ;; /usr/local/share/emacs/site-lisp/tm/ --- tm lisp files ;; @@ -95,6 +100,7 @@ ;; 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/mu/ --- MU lisp files ;; ~/share/xemacs/site-lisp/mel/ --- MEL lisp files ;; ~/share/xemacs/site-lisp/tm/ --- tm lisp files @@ -137,7 +143,7 @@ (setq rest (cdr rest)) ))) (expand-file-name (concat - (if running-emacs-19 + (if running-emacs-19_29-or-later "share/" "lib/") (cond ((boundp 'NEMACS) "nemacs/") @@ -156,11 +162,45 @@ (setq TM_LISPDIR (expand-file-name TM_PACKAGE_PREFIX LISPDIR)) (setq TL_DIR (expand-file-name TL_PREFIX TM_LISPDIR)) +(setq MU_DIR (expand-file-name MU_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) +(cond ((member LISPDIR default-load-path) + (if (string-equal TM_PACKAGE_PREFIX "") + (setq TL_RELATIVE_DIR TL_PREFIX + MU_RELATIVE_DIR MU_PREFIX + MEL_RELATIVE_DIR MEL_PREFIX + TM_KERNEL_RELATIVE_DIR TM_PREFIX + ) + (setq TL_RELATIVE_DIR + (concat (file-name-as-directory TM_PACKAGE_PREFIX) TL_PREFIX)) + (setq MU_RELATIVE_DIR + (concat (file-name-as-directory TM_PACKAGE_PREFIX) MU_PREFIX)) + (setq MEL_RELATIVE_DIR + (concat (file-name-as-directory TM_PACKAGE_PREFIX) MEL_PREFIX)) + (setq TM_KERNEL_RELATIVE_DIR + (concat (file-name-as-directory TM_PACKAGE_PREFIX) TM_PREFIX)) + )) + ((string-match (concat "^" (regexp-quote (expand-file-name "~/"))) + LISPDIR) + (setq TL_RELATIVE_DIR (concat "~/" (file-relative-name TL_DIR "~/"))) + (setq MU_RELATIVE_DIR (concat "~/" (file-relative-name MU_DIR "~/"))) + (setq MEL_RELATIVE_DIR (concat "~/" (file-relative-name MEL_DIR "~/"))) + (setq TM_KERNEL_RELATIVE_DIR + (concat "~/" (file-relative-name TM_KERNEL_DIR "~/"))) + ) + (t + (setq TL_RELATIVE_DIR TL_DIR) + (setq MU_RELATIVE_DIR MU_DIR) + (setq MEL_RELATIVE_DIR MEL_DIR) + (setq TM_KERNEL_RELATIVE_DIR TM_KERNEL_DIR) + )) +(setq TM_MHE_RELATIVE_DIR TM_KERNEL_RELATIVE_DIR) +(setq TM_GNUS_RELATIVE_DIR TM_KERNEL_RELATIVE_DIR) + (setq TM_GNUS_INSTALL_FORMAT "cd gnus; PWD=`pwd` make install-19 EMACS=%s TMDIR19=%s") (setq TM_GNUS_COMPILE ".gnus-compile") diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 8966575..b274a60 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,23 @@ +Tue Sep 3 15:30:22 1996 MORIOKA Tomohiko + + * tm/gnus: gnus-mime Version 0.6.1 was released. + + * mk-tgnus: gnus-msg-mime.el was abolished. + +Mon Sep 2 13:42:18 1996 MORIOKA Tomohiko + + * mk-tgnus: add "../../mu/" to load-path. + + * mk-tgnus: Constant `el-file-mode' was abolished. Function + `install-el', `install-el-files', `install-elc' and + `install-elc-files' were abolished. + + * mk-tgnus (install-tm-gnus): Use function `install-files'. + + * gnus-sum-mime.el (gnus-set-summary-default-charset): check + `gnus-summary-buffer' is active or not. (cf. [tm-en:735]) + + Fri Aug 23 07:32:40 1996 MORIOKA Tomohiko * tm/gnus: gnus-mime Version 0.6 was released. diff --git a/gnus/gnus-sum-mime.el b/gnus/gnus-sum-mime.el index d8f3f08..8e01a29 100644 --- a/gnus/gnus-sum-mime.el +++ b/gnus/gnus-sum-mime.el @@ -5,7 +5,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1996/8/6 ;; Version: -;; $Id: gnus-sum-mime.el,v 0.3 1996/08/12 09:04:14 morioka Exp $ +;; $Id: gnus-sum-mime.el,v 0.4 1996/09/02 10:03:58 morioka Exp $ ;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;; This file is not part of GNU Emacs yet. @@ -21,8 +21,9 @@ ;; General Public License for more details. ;; 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. +;; along with this program; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. ;;; Code: @@ -35,20 +36,22 @@ (defun gnus-set-summary-default-charset () (let ((charset - (save-excursion - (set-buffer gnus-summary-buffer) - (let ((rest gnus-newsgroup-default-charset-alist) - cell) - (catch 'tag - (while (setq cell (car rest)) - (if (string-match (car cell) gnus-newsgroup-name) - (throw 'tag - (progn - (make-local-variable 'default-mime-charset) - (setq default-mime-charset (cdr cell)) - ))) - (setq rest (cdr rest)) - ))) + (if (buffer-live-p gnus-summary-buffer) + (save-excursion + (set-buffer gnus-summary-buffer) + (let ((rest gnus-newsgroup-default-charset-alist) + cell) + (catch 'tag + (while (setq cell (car rest)) + (if (string-match (car cell) gnus-newsgroup-name) + (throw 'tag + (progn + (make-local-variable 'default-mime-charset) + (setq default-mime-charset (cdr cell)) + ))) + (setq rest (cdr rest)) + ))) + default-mime-charset) default-mime-charset))) (goto-char (point-min)) (while (< (point)(point-max)) @@ -56,7 +59,7 @@ (progn (end-of-line) (point)) - default-mime-charset) + charset) (forward-char) ))) diff --git a/gnus/mk-tgnus b/gnus/mk-tgnus index 3212e57..c243ce3 100644 --- a/gnus/mk-tgnus +++ b/gnus/mk-tgnus @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tgnus,v 7.1 1996/08/08 15:51:57 morioka Exp $ +;;; $Id: mk-tgnus,v 7.5 1996/09/03 15:30:22 morioka Exp $ ;;; (setq load-path @@ -9,10 +9,11 @@ (lambda (path) (expand-file-name path (getenv "PWD")) )) - '("." ".." "../../tl/" "../../mel/")) + '("." ".." "../../tl/" "../../mu/" "../../mel/")) load-path)) (require 'emu) +(require 'install) (defun compile-tm-gnus () (load "gnus.el") @@ -27,7 +28,7 @@ (byte-compile-file "gnus-sum-mime.el") (byte-compile-file "gnus-art-mime.el") (byte-compile-file "message-mime.el") - (byte-compile-file "gnus-msg-mime.el") + ;;(byte-compile-file "gnus-msg-mime.el") ) ((string-match "GNUS 4" gnus-version) (require 'tm-gnus) @@ -40,38 +41,6 @@ ;;(byte-compile-file "tm-gnus.el") ) -(defconst el-file-mode (+ (* 64 6)(* 8 4) 4)) - -(defun install-el (path file) - (let ((full-path (expand-file-name file path))) - (if (file-exists-p full-path) - (set-file-modes full-path el-file-mode) - ) - (copy-file file full-path t t) - (princ (format "%s -> %s\n" file path)) - )) - -(defun install-el-files (path &rest files) - (mapcar (function (lambda (file) - (if (file-exists-p file) - (install-el path file) - ))) - files)) - -(defun install-elc (path file) - (let ((full-path (expand-file-name file path))) - (copy-file file full-path t t) - (delete-file file) - (princ (format "%s -> %s\n" file path)) - )) - -(defun install-elc-files (path &rest files) - (mapcar (function (lambda (file) - (if (file-exists-p file) - (install-elc path file) - ))) - files)) - (defun install-tm-gnus () (let ((path (car command-line-args-left))) (princ (format "%s\n" emacs-version)) @@ -79,35 +48,41 @@ (make-directory path t) ) (cond (running-emacs-18 - (install-el-files path - "tm-gnus.el" - "tm-gnus3.el" "tm-gnus4.el" - "tm-gd3.el") - (install-elc-files path - ;;"tm-gnus.elc" - "tm-gnus3.elc" "tm-gnus4.elc") + (install-files '("tm-gnus.el" + "tm-gnus3.el" "tm-gnus4.el" + "tm-gd3.el") + "./" path nil 'overwrite) + (install-files '(;;"tm-gnus.elc" + "tm-gnus3.elc" "tm-gnus4.elc") + "./" path 'move) ) ((or (and running-emacs-19 (<= emacs-minor-version 29)) (and running-xemacs-19 (<= emacs-minor-version 13))) - (install-el-files path - "tm-gnus.el" "tm-gnus4.el" "tm-gd3.el" - "gnus-mime.el" "gnus-charset.el" - "gnus-sum-mime.el" "gnus-art-mime.el") - (install-elc-files path - ;;"tm-gnus.elc" - "tm-gnus4.elc" - "gnus-mime.elc" "gnus-charset.elc" - "gnus-sum-mime.elc" "gnus-art-mime.elc") + (install-files '("tm-gnus.el" "tm-gnus4.el" "tm-gd3.el" + "gnus-mime.el" "gnus-charset.el" + "gnus-sum-mime.el" "gnus-art-mime.el") + "./" path nil 'overwrite) + (install-files '(;;"tm-gnus.elc" + "tm-gnus4.elc" + "gnus-mime.elc" "gnus-charset.elc" + "gnus-sum-mime.elc" "gnus-art-mime.elc") + "./" path 'move) ) (t - (install-el-files path - "gnus-mime.el" "gnus-charset.el" - "gnus-sum-mime.el" "gnus-art-mime.el" - "message-mime.el" "gnus-msg-mime.el") - (install-elc-files path - "gnus-mime.elc" "gnus-charset.elc" - "gnus-sum-mime.elc" "gnus-art-mime.elc" - "message-mime.elc" "gnus-msg-mime.elc") + (install-files '("gnus-mime.el" "gnus-charset.el" + "gnus-sum-mime.el" "gnus-art-mime.el" + "message-mime.el" + ;;"gnus-msg-mime.el" + ) + "./" path nil 'overwrite) + (install-files '("gnus-mime.elc" "gnus-charset.elc" + "gnus-sum-mime.elc" "gnus-art-mime.elc" + "message-mime.elc" + ;;"gnus-msg-mime.elc" + ) + "./" path 'move) )) (setq command-line-args-left (cdr command-line-args-left)) )) + +;;; mk-tgnus ends here diff --git a/inst-tm b/inst-tm index 8996bc8..80b1c03 100644 --- a/inst-tm +++ b/inst-tm @@ -1,23 +1,24 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 7.23 1996/08/22 14:28:43 morioka Exp morioka $ +;;; $Id: inst-tm,v 7.30 1996/09/02 15:33:00 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 "mh-e/TMH-ELS") -(defun make-mime-setup (tl-path mel-path tm-path) +(defun make-mime-setup (tl-absolute-path tl-path mu-path mel-path tm-path) (let ((buf (find-file "mime-setup.el.in"))) (goto-char (point-min)) (re-search-forward "^;;; Code:" nil t) (setq buffer-read-only nil) - (if (member tl-path default-load-path) - (insert " -\(require \'tl-misc)") + ;; generate tl setting + (if (member tl-absolute-path default-load-path) + (insert "\n(require \'tl-misc)") (insert (format " @@ -26,18 +27,24 @@ load-path))) (require \'tl-misc) ) -\(add-path \"%s\")" tl-path tl-path)) +\(add-path \"%s\")" tl-absolute-path tl-path)) ) + + ;; generate MU load-path setting + (or (member mu-path default-load-path) + (insert (format "\n(add-path \"%s\")" mu-path))) + + ;; generate MEL load-path setting (or (member mel-path default-load-path) - (insert - (format " -\(add-path \"%s\")" mel-path))) + (insert (format "\n(add-path \"%s\")" mel-path))) + + ;; generate tm load-path setting (or (member tm-path default-load-path) - (insert - (format " -\(add-path \"%s\")" tm-path))) - (insert (format " -(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR)) + (insert (format "\n(add-path \"%s\")" tm-path))) + + ;; generate tm external-methods path setting + (insert + (format "\n(defvar mime-viewer/external-progs \"%s\")" METHOD_DIR)) (write-file "mime-setup.el") )) @@ -59,8 +66,10 @@ (require 'tm-edit) (load "rmailsum") (require 'tm-mh-e) - (make-mime-setup TL_DIR MEL_DIR TM_KERNEL_DIR) + (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 mel-modules "../mel/") (compile-elisp-modules tm-modules-to-compile ".") (compile-elisp-modules tm-mh-e-modules "mh-e/") @@ -93,21 +102,16 @@ (write-file TM_GNUS_COMPILE) )) -(defun install-el-and-elc-files (src dest el-files elc-files) - (install-files el-files src dest nil t) - (install-files elc-files src dest 'move) - ) - (defun install-tm () (princ (format "%s\n" emacs-version)) (print TL_DIR) - (install-el-and-elc-files "../tl/" TL_DIR tl-el-files tl-elc-files) + (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 "mh-e/" TM_MHE_DIR) (install-tm-gnus) - (install-el-and-elc-files "./" SETUP_FILE_DIR - '("mime-setup.el") '("mime-setup.elc")) + (install-elisp-modules '(mime-setup) "./" SETUP_FILE_DIR) ) (defun install-execs () diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index d6fafc4..bfb2ced 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 3 15:23:15 1996 MORIOKA Tomohiko + + * tm/mh-e: Version 7.68.1 was released. + + * mk-tmh: add "../../mu" to load-path. + + Sat Aug 31 15:15:12 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.68 was released. diff --git a/mh-e/mk-tmh b/mh-e/mk-tmh index 89a9275..e8cfb85 100644 --- a/mh-e/mk-tmh +++ b/mh-e/mk-tmh @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tmh,v 6.1 1996/08/22 14:44:28 morioka Exp $ +;;; $Id: mk-tmh,v 7.0 1996/09/03 15:23:15 morioka Exp $ ;;; (setq load-path (nconc @@ -8,7 +8,7 @@ (lambda (path) (expand-file-name path (getenv "PWD")) )) - '("." ".." "../../tl/" "../../mel/") + '("." ".." "../../tl" "../../mu" "../../mel") ) load-path)) diff --git a/mh-e/tmh-comp.el b/mh-e/tmh-comp.el index 3e32803..4eea5ef 100644 --- a/mh-e/tmh-comp.el +++ b/mh-e/tmh-comp.el @@ -1,34 +1,32 @@ -;;; ;;; tm-mh-e.el --- tm-mh-e functions for composing messages -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1993 .. 1996 MORIOKA Tomohiko -;;; Copyright (C) 1995,1996 OKABE Yasuo -;;; -;;; Author: MORIOKA Tomohiko -;;; OKABE Yasuo -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1996/2/29 (separated from tm-mh-e.el) -;;; Version: -;;; $Id: tmh-comp.el,v 7.5 1996/07/31 03:07:43 morioka Exp $ -;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual -;;; -;;; This file is part of tm (Tools for MIME). -;;; -;;; This program is free software; you can redistribute it and/or -;;; modify it under the terms of the GNU General Public License as -;;; published by the Free Software Foundation; either version 2, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;; General Public License for more details. -;;; -;;; 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. -;;; + +;; Copyright (C) 1993,1994,1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; OKABE Yasuo +;; Maintainer: MORIOKA Tomohiko +;; Created: 1996/2/29 (separated from tm-mh-e.el) +;; Version: +;; $Id: tmh-comp.el,v 7.6 1996/09/03 15:27:18 morioka Exp $ +;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual + +;; This file is part of tm (Tools for MIME). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with This program; see the file COPYING. If not, write to +;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + ;;; Code: (require 'mh-comp) diff --git a/tm-bbdb.el b/tm-bbdb.el index 1f337bd..f9eb188 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -6,7 +6,7 @@ ;; Author: KOBAYASHI Shuhei ;; Artur Pioro ;; Maintainer: Shuhei KOBAYASHI -;; Version: $Id: tm-bbdb.el,v 7.13 1996/08/30 17:09:46 morioka Exp $ +;; Version: $Id: tm-bbdb.el,v 7.15 1996/09/02 16:30:37 morioka Exp $ ;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB ;; This file is part of tm (Tools for MIME). @@ -30,7 +30,7 @@ (require 'bbdb) (require 'bbdb-com) -(require 'tl-822) +(require 'std11) (require 'tm-ew-d) (require 'tm-view) @@ -41,7 +41,7 @@ (defvar tm-bbdb/use-mail-extr t) (defun tm-bbdb/extract-address-components (str) - (let* ((ret (rfc822/extract-address-components str)) + (let* ((ret (std11-extract-address-components str)) (phrase (car ret)) (address (car (cdr ret))) (methods tm-bbdb/canonicalize-full-name-methods)) diff --git a/tm-edit.el b/tm-edit.el index 15b0e7c..e4e8b03 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.80 $ +;; Version: $Revision: 7.81 $ ;; 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.80 1996/08/30 15:16:52 morioka Exp $") + "$Id: tm-edit.el,v 7.81 1996/09/02 16:42:24 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -1671,8 +1671,8 @@ Content-Transfer-Encoding: 7bit (defun mime-editor/make-encrypt-recipient-header () (let* ((names mime-editor/encrypt-recipient-fields-list) (values - (rfc822/get-field-bodies (cons "From" names) - nil mail-header-separator)) + (std11-field-bodies (cons "From" names) + nil mail-header-separator)) (from (prog1 (car values) (setq values (cdr values)))) @@ -2133,7 +2133,7 @@ a recording host instead of local host." (while (and (re-search-forward mime-editor/yank-ignored-field-regexp nil t) (setq beg (match-beginning 0)) - (setq end (1+ (rfc822/field-end))) + (setq end (1+ (std11-field-end))) ) (delete-region beg end) ) -- 1.7.10.4