From: morioka Date: Mon, 9 Mar 1998 20:03:21 +0000 (+0000) Subject: tm 7.79. X-Git-Tag: tm7_79~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64f6da47517dd7323f789a3a6afa5ce5221b08cb;p=elisp%2Ftm.git tm 7.79. --- diff --git a/ChangeLog b/ChangeLog index b000291..826c634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,123 @@ +Fri Aug 23 07:41:35 1996 MORIOKA Tomohiko + + * tl: Version 7.48 was released. + * MEL: Version 5.6.1 was released. + * tm: Version 7.79 was released. + * tm/mh-e: Version 7.67 was released. + * tm/gnus: gnus-mime Version 0.6 was released. + + * Makefile: tl/tl-els was renamed to tl/TL-ELS. + * Makefile: mel/mel-els was renamed to mel/MEL-ELS. + * Makefile: tm/mh-e/tmh-els was renamed to tm/mh-e/TMH-ELS. + +Fri Aug 23 07:26:32 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/set-transfer-level-7bit): New function. + (mime-editor/set-transfer-level-8bit): New function. + Add new key-bindings. + +Thu Aug 22 14:28:43 1996 MORIOKA Tomohiko + + * inst-tm (install-tm): Use function `install-elisp-modules' to + install tm-mh-e. + + * inst-tm: tmh-els was renamed to TMH-ELS. + +Wed Aug 21 12:10:19 1996 MORIOKA Tomohiko + + * inst-tm (install-tm): Use function `install-elisp-modules' to + install tm kernel. + + * inst-tm (compile-tm): Variable `tm-modules' was renamed to + `tm-modules-to-compile'. + + * TM-ELS (tm-modules-to-compile): renamed from `tm-modules'. + (tm-modules-not-to-compile): renamed from `tm-el-files'; changed + to list of symbols. + +Mon Aug 19 17:56:09 1996 MORIOKA Tomohiko + + * inst-tm: Function `install-elc' and `install-elc-files' were + abolished. + + * inst-tm (install-el-and-elc-files): Use function `install-files' + to install *.elc. + + * inst-tm: Function `install-el-file' and `install-el-files' were + abolished. + + * inst-tm (install-el-and-elc-files): Use function `install-files' + to install *.el files. + (install-execs): Use function `install-files'. + +Mon Aug 19 17:00:26 1996 MORIOKA Tomohiko + + * inst-tm: Function `compile-el-files' was abolished. + + * inst-tm (compile-tm): Use function `compile-elisp-modules' to + compile MEL. + + * inst-tm: mel-els was renamed to MEL-ELS. + +Sun Aug 18 20:40:34 1996 MORIOKA Tomohiko + + * inst-tm (compile-tm): Use function `compile-elisp-modules' to + compile tl. + + * inst-tm: tl-els was renamed to TL-ELS. + +Sun Aug 18 20:26:10 1996 MORIOKA Tomohiko + + * TM-ELS: Variable `setup-modules', `setup-el-files' and + `setup-elc-files' were abolished. + + * TM-ELS (tm-modules): Changed to list of symbols. + + * inst-tm: Use install.el to compile tm modules. + + * mime-setup.el.in: Module `message' conflicts in Epoch. + +Sat Aug 17 02:41:20 1996 MORIOKA Tomohiko + + * tm-ew-d.el (mime/decode-message-header): Add DOC-string. + + * tm-ew-d.el (mime-eword/decode-region): Add DOC-string. + +Sat Aug 17 02:03:26 1996 MORIOKA Tomohiko + + * tm-ew-d.el (mime/decode-encoded-text): check `charset'. + +Fri Aug 16 16:09:49 1996 Jens Lautenbacher + + * tm-bbdb.el (tm-bbdb/pop-up-bbdb-buffer): In Gnus 5.[23] or Red + Gnus, the *BBDB* buffer pops up if there is a record connected to + the author of the current article and will be deleted if there is + no record. + +Fri Aug 16 05:03:42 1996 MORIOKA Tomohiko + + * tm-view.el (mime-article/rcnum-to-cinfo): Use function `find-if' + instead of `some-element'. + +Fri Aug 16 03:55:42 1996 MORIOKA Tomohiko + + * TM-CFG: check version specific site-lisp. + +Wed Aug 14 02:34:18 1996 MORIOKA Tomohiko + + * tm-view.el: delete `(require 'cl)'. + +Tue Aug 13 23:41:22 1996 MORIOKA Tomohiko + + * tm-view.el: Use cl.el. + +Mon Aug 12 17:05:37 1996 Hunter Kelly + + * tm-vm.el (tm-vm/preview-current-message): When using mime + preview in VM, VM fails to "energize" the headers the same way + that VM does by itself. (cf. [bug-tm-en:685]) + + Mon Aug 12 11:02:46 1996 MORIOKA Tomohiko * tm: Version 7.78 was released. diff --git a/Makefile b/Makefile index ef3768d..2eb97f0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 7.22 1996/05/08 15:40:58 morioka Exp morioka $ +# $Id: Makefile,v 7.25 1996/08/23 07:41:35 morioka Exp morioka $ # SHELL = /bin/sh @@ -37,18 +37,18 @@ TM_FILES = tm/README.en tm/ChangeLog \ TM_MUA_FILES = tm/tm-rmail.el tm/tm-vm.el tm/tm-mail.el \ tm/gnus/Makefile tm/gnus/*-path tm/gnus/mk-tgnus \ tm/gnus/*.el tm/gnus/ChangeLog \ - tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/tmh-els \ + tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/TMH-ELS \ tm/mh-e/code-jp.ol tm/mh-e/*.el tm/mh-e/ChangeLog -MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/mel-els mel/ChangeLog +MEL_FILES = mel/*.el mel/Makefile mel/mk-mel mel/MEL-ELS mel/ChangeLog -TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ +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 FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.78.tar.gz +TARFILE = tm7.79.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/TM-CFG b/TM-CFG index 5cb2d4f..31ead77 100644 --- a/TM-CFG +++ b/TM-CFG @@ -1,6 +1,6 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-CFG,v 7.1 1996/05/27 15:09:09 morioka Exp morioka $ +;;; $Id: TM-CFG,v 7.2 1996/08/16 03:55:42 morioka Exp morioka $ ;;; (defvar default-load-path load-path) @@ -14,6 +14,7 @@ load-path)) (require 'tl-misc) +(require 'install) ;;; @ Please specify optional package directory if you use them. @@ -56,7 +57,6 @@ (expand-file-name "../../.." exec-directory) (expand-file-name "../../../.." exec-directory) )) -;;(setq EXEC_PREFIX "~/") ; install to your home directory ;; Please specify tm package prefix [optional] (setq TM_PACKAGE_PREFIX "") @@ -119,21 +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)) - (or (string-match PATTERN-TO-AVOID dir) - (if (string-match PATTERN-TO-INSTALL dir) - (throw 'tag (substring dir 0 (match-end 0))) - )) + (if (string-match + (concat + "^" (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX) "$") + dir) + (or (string-match (format "%d\\.%d" + emacs-major-version + emacs-minor-version) dir) + (throw 'tag dir) + )) (setq rest (cdr rest)) ))) (expand-file-name (concat diff --git a/TM-ELS b/TM-ELS index 610d912..33ea3f3 100644 --- a/TM-ELS +++ b/TM-ELS @@ -1,88 +1,51 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: TM-ELS,v 5.0 1996/05/08 15:01:30 morioka Exp $ +;;; $Id: TM-ELS,v 7.1 1996/08/21 11:56:50 morioka Exp $ ;;; -(require 'tl-misc) - -(setq tm-modules - '("signature" - "tm-def" - "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-uncompile-el-files '("sc-setup.el")) - -(if (file-installed-p "ange-ftp.el") - (setq tm-modules (append tm-modules '("tm-ftp"))) - (setq tm-uncompile-el-files - (append tm-uncompile-el-files '("tm-ftp.el"))) - ) - -(if (file-installed-p "vm.elc") - (setq tm-modules (append tm-modules '("tm-vm"))) - (setq tm-uncompile-el-files - (append tm-uncompile-el-files '("tm-vm.el"))) - ) - -(if (file-installed-p "mailcrypt.el") - (setq tm-modules (append tm-modules '("tm-pgp"))) - (setq tm-uncompile-el-files - (append tm-uncompile-el-files '("tm-pgp.el"))) - ) - -(if (file-installed-p "bbdb.el") - (setq tm-modules (append tm-modules '("tm-bbdb"))) - (setq tm-uncompile-el-files - (append tm-uncompile-el-files '("tm-bbdb.el"))) - ) +(setq tm-modules-to-compile + '(signature + tm-def + 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)) + +(mapcar (function + (lambda (cell) + (let ((c-module (car cell)) + (i-module (cdr cell)) + ) + (if (module-installed-p c-module) + (setq tm-modules-to-compile + (nconc tm-modules-to-compile (list i-module))) + (setq tm-modules-not-to-compile + (nconc tm-modules-not-to-compile (list i-module))) + ) + ))) + '((ange-ftp . tm-ftp) + (vm . tm-vm) + (mailcrypt . tm-pgp) + (bbdb . tm-bbdb) + )) (if (and (file-exists-p "tm-evs.el") (or (boundp 'MULE) (boundp 'NEMACS)) ) - (setq tm-modules (append tm-modules '("tm-evs"))) + (setq tm-modules-to-compile (nconc tm-modules-to-compile '(tm-evs))) ) -(if (string-match "XEmacs" emacs-version) - (setq tm-modules (append tm-modules '("tm-image"))) - (if (boundp 'MULE) - (if (file-installed-p "bitmap.el") - (setq tm-modules (append tm-modules '("tm-image"))) - (setq tm-uncompile-el-files - (append tm-uncompile-el-files '("tm-image.el"))) - ))) - -(setq tm-el-files - (append - (mapcar (function (lambda (module) - (concat module ".el") - )) - tm-modules) - tm-uncompile-el-files)) - -(setq tm-elc-files - (mapcar (function (lambda (module) - (concat module ".elc") - )) - tm-modules)) - - -(setq setup-modules '("mime-setup")) +(if (or (string-match "XEmacs" emacs-version) + (boundp 'MULE) + ) + (setq tm-modules-to-compile (nconc tm-modules-to-compile '(tm-image))) + ) -(setq setup-el-files - (mapcar (function (lambda (module) - (concat module ".el") - )) - setup-modules)) +(setq tm-modules (append tm-modules-to-compile + tm-modules-not-to-compile)) -(setq setup-elc-files - (mapcar (function (lambda (module) - (concat module ".elc") - )) - setup-modules)) +;;; TM-ELS ends here diff --git a/gnus/ChangeLog b/gnus/ChangeLog index 4c0a26b..8966575 100644 --- a/gnus/ChangeLog +++ b/gnus/ChangeLog @@ -1,3 +1,37 @@ +Fri Aug 23 07:32:40 1996 MORIOKA Tomohiko + + * tm/gnus: gnus-mime Version 0.6 was released. + +Thu Aug 22 17:55:17 1996 MORIOKA Tomohiko + + * gnus-mime.el: Use tl-misc. + + * gnus-charset.el (nnmail-find-file): DOC-string was modified. + + * gnus-charset.el (nntp-open-binary-connection-function): New + variable. + (nntp-open-network-stream-with-no-code-conversion): New function. + +Sun Aug 18 11:17:13 1996 MORIOKA Tomohiko + + * gnus-charset.el (gnus-set-newsgroup-default-charset): New + implementation; Function `put-alist' and `set-alist' were + abolished. + + * gnus-charset.el (put-alist): imported from tl-list.el. + (set-alist): imported from tl-list.el. + +Sat Aug 17 02:55:36 1996 MORIOKA Tomohiko + + * gnus-mime.el: Don't setup news-reply-menu of XEmacs for Red + Gnus. + +Sat Aug 17 02:45:14 1996 MORIOKA Tomohiko + + * gnus-art-mime.el: autoload tm-ew-d.el and tm-view.el instead of + require. + + Mon Aug 12 09:11:34 1996 MORIOKA Tomohiko * tm/gnus: gnus-mime Version 0.4 was released. diff --git a/gnus/gnus-art-mime.el b/gnus/gnus-art-mime.el index 5d22a5d..15d91c6 100644 --- a/gnus/gnus-art-mime.el +++ b/gnus/gnus-art-mime.el @@ -5,7 +5,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1996/8/6 ;; Version: -;; $Id: gnus-art-mime.el,v 0.4 1996/08/12 09:00:14 morioka Exp $ +;; $Id: gnus-art-mime.el,v 0.5 1996/08/17 02:45:14 morioka Exp $ ;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;; This file is not part of GNU Emacs yet. @@ -21,14 +21,23 @@ ;; 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: -(require 'tm-view) +(require 'emu) (require 'gnus-art) +(autoload 'mime-eword/decode-region "tm-ew-d" + "Decode MIME encoded-words in region." t) +(autoload 'mime/decode-message-header "tm-ew-d" + "Decode MIME encoded-words in message header." t) +(autoload 'mime/viewer-mode "tm-view" + "Major mode for viewing MIME message." t) + + (defun gnus-decode-rfc1522 () (goto-char (point-min)) (if (re-search-forward "^[0-9]+\t" nil t) diff --git a/gnus/gnus-charset.el b/gnus/gnus-charset.el index 561adc9..0d008af 100644 --- a/gnus/gnus-charset.el +++ b/gnus/gnus-charset.el @@ -5,7 +5,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1996/8/6 ;; Version: -;; $Id: gnus-charset.el,v 0.2 1996/08/12 09:06:54 morioka Exp $ +;; $Id: gnus-charset.el,v 0.6 1996/08/22 17:51:22 morioka Exp $ ;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;; This file is not part of GNU Emacs yet. @@ -21,14 +21,13 @@ ;; 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: -(defvar running-xemacs (string-match "XEmacs" emacs-version)) -(defvar running-xemacs-20 (and running-xemacs - (= emacs-major-version 20))) +(require 'gnus) ;;; @ newsgroup default charset @@ -38,9 +37,15 @@ (defun gnus-set-newsgroup-default-charset (newsgroup charset) "Set CHARSET for the NEWSGROUP as default MIME charset." - (set-alist 'gnus-newsgroup-default-charset-alist - (concat "^" (regexp-quote newsgroup) "\\($\\|\\.\\)") - charset)) + (let* ((ng-regexp (concat "^" (regexp-quote newsgroup) "\\($\\|\\.\\)")) + (pair (assoc ng-regexp gnus-newsgroup-default-charset-alist)) + ) + (if pair + (setcdr pair charset) + (setq gnus-newsgroup-default-charset-alist + (cons (cons ng-regexp charset) + gnus-newsgroup-default-charset-alist)) + ))) ;;; @ for mule (Multilingual support) @@ -48,16 +53,28 @@ (cond ((featurep 'mule) - (cond ((boundp 'MULE) ; for MULE 1.* and 2.*. - (defun gnus-set-nntp-coding-system () - (define-service-coding-system gnus-nntp-service nil *noconv*) - ) - (add-hook 'gnus-open-server-hook 'gnus-set-nntp-coding-system) - ) - (running-xemacs-20 - (or (boundp '*noconv*) - (defconst *noconv* 'noconv) - ))) + (require 'emu) + (defvar nntp-open-binary-connection-function + (if (featurep 'gnus-load) + ;; maybe Red Gnus + (if (boundp 'nntp-open-connection-function) + nntp-open-connection-function + 'nntp-open-network-stream) + ;; maybe Gnus 5.[01] or Gnus 5.[23] + (if (boundp 'nntp-open-server-function) + nntp-open-server-function + 'nntp-open-network-stream) + )) + (defun nntp-open-network-stream-with-no-code-conversion (&rest args) + (let ((proc (apply nntp-open-binary-connection-function args))) + (set-process-input-coding-system proc *noconv*) + proc)) + (if (featurep 'gnus-load) + (setq nntp-open-connection-function + 'nntp-open-network-stream-with-no-code-conversion) + (setq nntp-open-server-function + 'nntp-open-network-stream-with-no-code-conversion) + ) (call-after-loaded 'nnheader (lambda () @@ -75,7 +92,7 @@ 'nnmail (lambda () (defun nnmail-find-file (file) - "Insert FILE in server buffer safely. [tm-gnus5.el]" + "Insert FILE in server buffer safely. [gnus-charset.el]" (set-buffer nntp-server-buffer) (erase-buffer) (let ((format-alist nil) diff --git a/gnus/gnus-mime.el b/gnus/gnus-mime.el index 66fbf61..7829b51 100644 --- a/gnus/gnus-mime.el +++ b/gnus/gnus-mime.el @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko ;; Created: 1996/8/6 -;; Version: $Revision: 0.4 $ +;; Version: $Revision: 0.6 $ ;; Keywords: news, MIME, multimedia, multilingual, encoded-word ;; This file is not part of GNU Emacs yet. @@ -20,38 +20,20 @@ ;; 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: -(defun call-after-loaded (module func &optional hook-name) - "If MODULE is provided, then FUNC is called. -Otherwise func is set to MODULE-load-hook. -If optional argument HOOK-NAME is specified, -it is used as hook to set. [gnus-mime.el]" - (if (featurep module) - (funcall func) - (progn - (if (null hook-name) - (setq hook-name - (intern (concat (symbol-name module) "-load-hook"))) - ) - (add-hook hook-name func) - ))) - -(defun get-version-string (id) - "Return a version-string from RCS ID. [gnus-mime.el]" - (and (string-match ",v \\([0-9][0-9.][0-9.]+\\)" id) - (substring id (match-beginning 1)(match-end 1)) - )) +(require 'tl-misc) ;;; @ version ;;; (defconst gnus-mime-RCS-ID - "$Id: gnus-mime.el,v 0.4 1996/08/12 08:57:33 morioka Exp $") + "$Id: gnus-mime.el,v 0.6 1996/08/22 17:55:17 morioka Exp $") (defconst gnus-mime-version (get-version-string gnus-mime-RCS-ID)) @@ -150,32 +132,6 @@ The function is called from the article buffer.") ))) -;;; @ for tm-edit -;;; - -;;; 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 () - (if (string-match "XEmacs\\|Lucid" emacs-version) - (add-hook 'news-setup-hook 'mime-editor/attach-to-news-reply-menu) - ) - ))) - - ;;; @ end ;;; @@ -205,6 +161,30 @@ The function is called from the article buffer.") (setq gnus-strict-mime nil) )) + + (if running-xemacs + (progn + ;; 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 () + (add-hook 'news-setup-hook + 'mime-editor/attach-to-news-reply-menu) + ))) + )) )) (run-hooks 'gnus-mime-load-hook) diff --git a/inst-tm b/inst-tm index c0ae129..8996bc8 100644 --- a/inst-tm +++ b/inst-tm @@ -1,13 +1,13 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: inst-tm,v 7.8 1996/07/22 18:29:22 morioka Exp $ +;;; $Id: inst-tm,v 7.23 1996/08/22 14:28:43 morioka Exp morioka $ ;;; (load-file "TM-CFG") -(load-file "../tl/tl-els") -(load-file "../mel/mel-els") +(load-file "../tl/TL-ELS") +(load-file "../mel/MEL-ELS") (load-file "TM-ELS") -(load-file "mh-e/tmh-els") +(load-file "mh-e/TMH-ELS") (defun make-mime-setup (tl-path mel-path tm-path) (let ((buf (find-file "mime-setup.el.in"))) @@ -41,19 +41,6 @@ (write-file "mime-setup.el") )) -(defun compile-el-files (path modules) - (mapcar (function - (lambda (module) - (setq module (expand-file-name module path)) - (let ((el-file (concat module ".el")) - (elc-file (concat module ".elc")) - ) - (if (file-newer-than-file-p el-file elc-file) - (byte-compile-file el-file) - ) - ))) - modules)) - (defun install-tm-gnus () (erase-buffer) (call-process SHELL @@ -73,11 +60,11 @@ (load "rmailsum") (require 'tm-mh-e) (make-mime-setup TL_DIR MEL_DIR TM_KERNEL_DIR) - (compile-el-files "../tl/" tl-modules) - (compile-el-files "../mel/" mel-modules) - (compile-el-files "./" tm-modules) - (compile-el-files "mh-e/" tm-mh-e-modules) - (compile-el-files "./" '("mime-setup")) + (compile-elisp-modules tl-modules "../tl/") + (compile-elisp-modules mel-modules "../mel/") + (compile-elisp-modules tm-modules-to-compile ".") + (compile-elisp-modules tm-mh-e-modules "mh-e/") + (compile-elisp-module 'mime-setup ".") (save-excursion (set-buffer (get-buffer-create TM_GNUS_COMPILE)) (let ((emacs (car command-line-args))) @@ -106,69 +93,26 @@ (write-file TM_GNUS_COMPILE) )) -(defun install-el-file (src dest file) - (let ((src-file (expand-file-name file src))) - (if (file-exists-p src-file) - (let ((full-path (expand-file-name file dest))) - (if (file-exists-p full-path) - (set-file-modes full-path el-file-mode) - ) - (copy-file src-file full-path t t) - (princ (format "%s -> %s\n" file dest)) - )) - )) - -(defun install-el-files (src dest &rest files) - (or (file-exists-p dest) - (make-directory dest t) - ) - (mapcar (function (lambda (file) - (install-el-file src dest file) - )) - files)) - -(defun install-elc (src dest file) - (let ((src-file (expand-file-name file src))) - (if (file-exists-p src-file) - (let ((full-path (expand-file-name file dest))) - (copy-file src-file full-path t t) - (catch 'tag - (while (file-exists-p src-file) - (condition-case err - (progn - (delete-file src-file) - (throw 'tag nil) - ) - (error (princ (format "%s\n" (nth 1 err)))) - ))) - (princ (format "%s -> %s\n" file dest)) - )) - )) - -(defun install-elc-files (src dest &rest files) - (mapcar (function (lambda (file) - (install-elc src dest file) - )) - files)) - (defun install-el-and-elc-files (src dest el-files elc-files) - (apply (function install-el-files) src dest el-files) - (apply (function install-elc-files) src dest 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-el-and-elc-files "../mel/" MEL_DIR mel-el-files mel-elc-files) - (install-el-and-elc-files "./" TM_KERNEL_DIR tm-el-files tm-elc-files) - (install-el-and-elc-files "mh-e/" TM_MHE_DIR - tm-mh-e-el-files tm-mh-e-elc-files) + (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 setup-el-files setup-elc-files) + (install-el-and-elc-files "./" SETUP_FILE_DIR + '("mime-setup.el") '("mime-setup.elc")) ) (defun install-execs () - (apply (function install-el-files) BIN_SRC_DIR BIN_DIR BINS) - (apply (function install-el-files) METHOD_SRC_DIR METHOD_DIR METHODS) + (install-files BINS BIN_SRC_DIR BIN_DIR) + (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t) ) + +;;; inst-tm ends here diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index 4ce54c2..1ee40de 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,34 @@ +Fri Aug 23 07:33:58 1996 MORIOKA Tomohiko + + * tm/mh-e: Version 7.67 was released. + +Thu Aug 22 14:44:28 1996 MORIOKA Tomohiko + + * TMH-ELS: Variable `tm-mh-e-el-files' and `tm-mh-e-elc-files' + were abolished. + + * mk-tmh: Constant `el-file-mode' was abolished. + Function `install-el', `install-el-files', `install-elc' and + `install-elc-files' were abolished. + (install-tm-mh-e): Use function `install-elisp-modules'. + + * mk-tmh: tmh-els was renamed to TMH-ELS. + +Sun Aug 18 20:22:01 1996 MORIOKA Tomohiko + + * tmh-els (tm-mh-e-modules): changed to list of symbols. + + * mk-tmh: Use install.el to compile. + +Wed Aug 14 02:35:19 1996 MORIOKA Tomohiko + + * tm-mh-e.el: Don't use cl.el. + +Tue Aug 13 23:45:02 1996 MORIOKA Tomohiko + + * tm-mh-e.el: Use cl.el. + + Thu Aug 1 07:43:19 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.65.1 was released. diff --git a/mh-e/TMH-ELS b/mh-e/TMH-ELS new file mode 100644 index 0000000..fc1a76a --- /dev/null +++ b/mh-e/TMH-ELS @@ -0,0 +1,14 @@ +;;; -*-Emacs-Lisp-*- +;;; +;;; $Id: TMH-ELS,v 3.0 1996/08/22 14:36:47 morioka Exp $ +;;; + +(require 'mh-e) + +(setq tm-mh-e-modules '(tm-mh-e tmh-comp)) + +(or (featurep 'mh-utils) + (setq tm-mh-e-modules (cons 'tm-mh-e3 tm-mh-e-modules)) + ) + +;;; TMH-ELS ends here diff --git a/mh-e/mk-tmh b/mh-e/mk-tmh index 1df657b..89a9275 100644 --- a/mh-e/mk-tmh +++ b/mh-e/mk-tmh @@ -1,9 +1,9 @@ ;;; -*-Emacs-Lisp-*- ;;; -;;; $Id: mk-tmh,v 3.0 1996/03/04 09:22:37 morioka Exp morioka $ +;;; $Id: mk-tmh,v 6.1 1996/08/22 14:44:28 morioka Exp $ ;;; -(setq load-path (append +(setq load-path (nconc (mapcar (function (lambda (path) (expand-file-name path (getenv "PWD")) @@ -14,55 +14,22 @@ (require 'mh-e) (require 'emu) +(require 'install) -(load-file "tmh-els") +(load-file "TMH-ELS") (defun compile-tm-mh-e () (require 'tm-mh-e) (require 'mh-comp) (require 'tm-edit) - (mapcar (function byte-compile-file) tm-mh-e-el-files) + (compile-elisp-modules tm-mh-e-modules ".") ) -(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-mh-e () (let ((path (car command-line-args-left))) - (princ (format "%s\n" emacs-version)) - (if (not (file-exists-p path)) - (make-directory path t) - ) - (apply (function install-el-files) path tm-mh-e-el-files) - (apply (function install-elc-files) path tm-mh-e-elc-files) - (setq command-line-args-left (cdr command-line-args-left)) - )) + (install-elisp-modules tm-mh-e-modules "./" path) + ) + (setq command-line-args-left (cdr command-line-args-left)) + ) + +;;; mk-tmh ends here diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index d2458c2..17a8569 100644 --- a/mh-e/tm-mh-e.el +++ b/mh-e/tm-mh-e.el @@ -1,33 +1,30 @@ -;;; -;;; tm-mh-e.el --- MIME extender for mh-e -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1993 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; OKABE Yasuo -;;; modified by YAMAOKA Katsumi -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1993/11/21 (obsolete mh-e-mime.el) -;;; Version: $Revision: 7.65 $ -;;; 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. -;;; +;;; tm-mh-e.el --- MIME extension for mh-e + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; OKABE Yasuo +;; Maintainer: MORIOKA Tomohiko +;; Created: 1993/11/21 (obsolete mh-e-mime.el) +;; Version: $Revision: 7.67 $ +;; 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. + ;;; Code: (require 'tl-str) @@ -50,7 +47,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.65 1996/07/18 12:29:17 morioka Exp $") + "$Id: tm-mh-e.el,v 7.67 1996/08/14 02:35:19 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) diff --git a/mime-setup.el.in b/mime-setup.el.in index 132faf1..e8d473e 100644 --- a/mime-setup.el.in +++ b/mime-setup.el.in @@ -1,32 +1,30 @@ -;;; ;;; mime-setup.el --- setup file for tm viewer and composer. -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Maintainer: Shuhei KOBAYASHI -;;; and MORIOKA Tomohiko -;;; Version: -;;; $Id: mime-setup.el.in,v 7.23 1996/08/10 12:04:21 morioka Exp $ -;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word -;;; -;;; 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) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Maintainer: Shuhei KOBAYASHI +;; Version: +;; $Id: mime-setup.el.in,v 7.25 1996/08/18 17:03:42 morioka Exp $ +;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word + +;; 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 'tm-setup) @@ -136,16 +134,19 @@ ;;; @ 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) -(add-hook 'message-header-hook 'mime/encode-message-header) - -(call-after-loaded - 'message - (function - (lambda () - (require 'message-mime) - ))) +(or (boundp 'epoch::version) + (progn + (add-hook 'message-setup-hook 'mime/editor-mode) + (add-hook 'message-send-hook 'mime-editor/maybe-translate) + (add-hook 'message-header-hook 'mime/encode-message-header) + + (call-after-loaded + 'message + (function + (lambda () + (require 'message-mime) + ))) + )) ;;; @ end diff --git a/tm-bbdb.el b/tm-bbdb.el index 253c1b6..3f09432 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -1,32 +1,31 @@ -;;; ;;; tm-bbdb.el --- tm shared module for BBDB -;;; -;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei -;;; Copyright (C) 1996 Artur Pioro -;;; -;;; Author: KOBAYASHI Shuhei -;;; Artur Pioro -;;; modified by Pekka Marjola -;;; Maintainer: KOBAYASHI Shuhei -;;; Version: $Id: tm-bbdb.el,v 7.10 1996/07/01 23:43:25 morioka Exp $ -;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB -;;; -;;; 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) 1995,1996 KOBAYASHI Shuhei +;; Copyright (C) 1996 Artur Pioro + +;; Author: KOBAYASHI Shuhei +;; Artur Pioro +;; Maintainer: Shuhei KOBAYASHI +;; Version: $Id: tm-bbdb.el,v 7.11 1996/08/22 14:10:20 morioka Exp $ +;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB + +;; 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 'bbdb) @@ -190,6 +189,10 @@ displaying the record corresponding to the sender of the current message." (bbdb-elided-display (bbdb-pop-up-elided-display)) (b (current-buffer))) (bbdb-display-records (if record (list record) nil)) + (if (not record) + (progn + (set-buffer "*BBDB*") + (delete-window))) (set-buffer b) record))) diff --git a/tm-edit.el b/tm-edit.el index b8ab369..2a14520 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -1,31 +1,30 @@ -;;; ;;; tm-edit.el --- Simple MIME Composer for GNU Emacs -;;; -;;; Copyright (C) 1993 UMEDA Masanobu -;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: UMEDA Masanobu -;;; MORIOKA Tomohiko -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1994/08/21 renamed from mime.el -;;; Version: $Revision: 7.78 $ -;;; Keywords: mail, news, MIME, multimedia, 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 .. 1996 Free Software Foundation, Inc. + +;; Author: UMEDA Masanobu +;; MORIOKA Tomohiko +;; Maintainer: MORIOKA Tomohiko +;; Created: 1994/08/21 renamed from mime.el +;; Version: $Revision: 7.79 $ +;; Keywords: mail, news, MIME, multimedia, 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. ;;; Commentary: @@ -122,7 +121,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.78 1996/08/11 13:57:11 morioka Exp $") + "$Id: tm-edit.el,v 7.79 1996/08/23 07:26:32 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -524,6 +523,11 @@ Tspecials means any character that matches with it in header must be quoted.") (define-key keymap "s" 'mime-editor/enclose-signed-region) (define-key keymap "e" 'mime-editor/enclose-encrypted-region) (define-key keymap "q" 'mime-editor/enclose-quote-region) + (define-key keymap "7" 'mime-editor/set-transfer-level-7bit) + (define-key keymap "8" 'mime-editor/set-transfer-level-8bit) + (define-key keymap "/" 'mime-editor/set-split) + (define-key keymap "v" 'mime-editor/set-sign) + (define-key keymap "h" 'mime-editor/set-encrypt) (define-key keymap "\C-p" 'mime-editor/preview-message) (define-key keymap "\C-z" 'mime-editor/exit) (define-key keymap "?" 'mime-editor/help) @@ -2237,6 +2241,16 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8." (force-mode-line-update) ) +(defun mime-editor/set-transfer-level-7bit () + (interactive) + (mime-editor/toggle-transfer-level 7) + ) + +(defun mime-editor/set-transfer-level-8bit () + (interactive) + (mime-editor/toggle-transfer-level 8) + ) + ;;; @ pgp ;;; diff --git a/tm-ew-d.el b/tm-ew-d.el index 0eabbea..271180b 100644 --- a/tm-ew-d.el +++ b/tm-ew-d.el @@ -1,34 +1,31 @@ -;;; -;;; tm-ew-d.el --- RFC 1522 based multilingual MIME message header -;;; decoder for GNU Emacs -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1992 ENAMI Tsugutomo -;;; Copyright (C) 1993 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: ENAMI Tsugutomo -;;; MORIOKA Tomohiko -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1993/6/3 (1995/10/3 obsolete tiny-mime.el) -;;; Version: $Revision: 7.18 $ -;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word -;;; -;;; 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. -;;; +;;; tm-ew-d.el --- RFC 1522 based MIME encoded-word decoder for GNU Emacs + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: ENAMI Tsugutomo +;; MORIOKA Tomohiko +;; Maintainer: MORIOKA Tomohiko +;; Created: 1993/6/3 (1995/10/3 obsolete tiny-mime.el) +;; Version: $Revision: 7.21 $ +;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word + +;; 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 'emu) @@ -41,7 +38,7 @@ ;;; (defconst tm-ew-d/RCS-ID - "$Id: tm-ew-d.el,v 7.18 1996/08/07 15:50:44 morioka Exp $") + "$Id: tm-ew-d.el,v 7.21 1996/08/17 02:41:20 morioka Exp $") (defconst mime/eword-decoder-version (get-version-string tm-ew-d/RCS-ID)) @@ -97,6 +94,9 @@ ;;; (defun mime-eword/decode-region (beg end &optional unfolding must-unfold) + "Decode MIME encoded-words in region between BEG and END. +If UNFOLDING is not nil, it unfolds before decoding. +If MUST-UNFOLD is not nil, it unfolds encoded results. [tm-ew-d.el]" (interactive "*r") (save-excursion (save-restriction @@ -126,6 +126,7 @@ ;;; (defun mime/decode-message-header () + "Decode MIME encoded-words in message header. [tm-ew-d.el]" (interactive "*") (save-excursion (save-restriction @@ -176,20 +177,22 @@ ;;; (defun mime/decode-encoded-text (charset encoding str &optional unfolding) - (let ((dest - (cond ((string-equal "B" encoding) - (base64-decode-string str)) - ((string-equal "Q" encoding) - (q-encoding-decode-string str)) - (t (message "unknown encoding %s" encoding) - nil)))) - (if dest - (progn - (setq dest (decode-mime-charset-string dest charset)) - (if unfolding - (rfc822/unfolding-string dest) - dest) - )))) + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (let ((dest + (cond ((string-equal "B" encoding) + (base64-decode-string str)) + ((string-equal "Q" encoding) + (q-encoding-decode-string str)) + (t (message "unknown encoding %s" encoding) + nil)))) + (if dest + (progn + (setq dest (decode-coding-string dest cs)) + (if unfolding + (rfc822/unfolding-string dest) + dest) + )))))) ;;; @ end diff --git a/tm-view.el b/tm-view.el index 1cb26da..dd54017 100644 --- a/tm-view.el +++ b/tm-view.el @@ -1,32 +1,29 @@ -;;; ;;; tm-view.el --- interactive MIME viewer for GNU Emacs -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; modified by Steven L. Baur -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) -;;; Version: $Revision: 7.66 $ -;;; Keywords: mail, news, MIME, multimedia -;;; -;;; 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) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el) +;; Version: $Revision: 7.69 $ +;; Keywords: mail, news, MIME, multimedia + +;; 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 'tl-str) @@ -45,7 +42,7 @@ ;;; (defconst mime-viewer/RCS-ID - "$Id: tm-view.el,v 7.66 1996/07/01 23:42:12 morioka Exp $") + "$Id: tm-view.el,v 7.69 1996/08/16 05:03:42 morioka Exp $") (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID)) (defconst mime/viewer-version mime-viewer/version) @@ -608,13 +605,12 @@ The compressed face will be piped to this command.") (or cinfo (setq cinfo mime::article/content-info) ) - (some-element - (function - (lambda (ci) - (equal (mime::content-info/rcnum ci) rcnum) - )) - (mime/flatten-content-info cinfo) - )) + (find-if (function + (lambda (ci) + (equal (mime::content-info/rcnum ci) rcnum) + )) + (mime/flatten-content-info cinfo) + )) (defun mime-article/cnum-to-cinfo (cn &optional cinfo) (or cinfo diff --git a/tm-vm.el b/tm-vm.el index e482660..6277609 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -7,12 +7,9 @@ ;; MORIOKA Tomohiko ;; Shuhei KOBAYASHI ;; Oscar Figueiredo -;; modified by SHIONO Jun'ichi -;; ISHIHARA Akito -;; Rob Kooper ;; Maintainer: Shuhei KOBAYASHI ;; Created: 1994/10/29 -;; Version: $Revision: 7.56 $ +;; Version: $Revision: 7.57 $ ;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;; This file is part of tm (Tools for MIME). @@ -41,7 +38,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.56 1996/08/12 10:07:35 morioka Exp $") + "$Id: tm-vm.el,v 7.57 1996/08/13 13:12:50 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -243,7 +240,8 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") (if (or vm-highlighted-header-regexp (and (vm-xemacs-p) vm-use-lucid-highlighting)) (vm-highlight-headers)) - ;; + (if (and vm-use-menus (vm-menu-support-possible-p)) + (vm-energize-headers)) ;; (goto-char (point-min)) (narrow-to-region (point) (search-forward "\n\n" nil t)) ))