From 34f7fd72edf87445ea4ff9fbb8776f99ea914fa0 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 15:17:57 +0000 Subject: [PATCH] tm 7.41.3. --- ChangeLog | 34 ++++++++++++++++++++ Makefile | 2 +- mh-e/ChangeLog | 8 +++++ mh-e/tm-mh-e.el | 7 +++-- mk-tm | 15 ++++++++- tm-bbdb.el | 23 +++++++------- tm-ew-d.el | 20 +++++++----- tm-image.el | 94 ++++++++++++++++++++++++++++++++++--------------------- tm-play.el | 14 ++++++--- tm-vm.el | 6 ++-- 10 files changed, 156 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index a09855c..99a09b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +Wed Jan 31 17:15:55 1996 Morioka Tomohiko + + * tm-image.el: xbm support in Mule: It requires bitmap package. + + * tm-image.el (mime-viewer/graphic-converter-alist): use `defvar' + instead of `setq' + +Fri Jan 26 02:49:06 1996 Shuhei KOBAYASHI + + * tm-bbdb.el (tm-bbdb/update-record): fixed problem in VM + + * tm-bbdb.el (tm-bbdb/extract-address-components): modified to + support `If no name can be extracted, FULL-NAME will be nil.' + (cf. [tm-ja:1531]) + +Thu Jan 25 08:29:22 1996 Morioka Tomohiko + + * tm-play.el (mime-article/make-method-args): modified to use + "7bit" if 'encoding is not found + +Thu Jan 25 06:36:44 1996 Morioka Tomohiko + + * tm-ew-d.el (mime-eword/decode-string): set to `end' just + string-matched. + +Thu Jan 25 06:22:17 1996 Morioka Tomohiko + + * tm-ew-d.el (mime-eword/decode-string): fixed about + linear-while-space (cf. [tm-ja:1518]) + + * tm-vm.el (tm-vm/quit-view-message): Typo was fixed. + (cf. [tm-en:281]) + + Thu Jan 25 03:24:35 1996 Morioka Tomohiko * tl: Version 7.10 was released. diff --git a/Makefile b/Makefile index 1c595c3..0a6a200 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.41.2.tar.gz +TARFILE = tm7.41.3.tar.gz 18: diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index 7c3f06b..fd76a27 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 25 15:00:14 1996 Michael Sperber + + * tm-mh-e.el: I remember making this change for 6.80.1, but it + seems to work with 7.41.1. It's relevant if you're using tm in + conjunction with mh-e and BBDB. Without it, BBDB gets confused + about the window configuration when making an update. + (cf. [bug-tm-en:288]) + Tue Jan 23 04:51:18 1996 Morioka Tomohiko * tm/mh-e: Version 7.46 was released. diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el index 1bbff3a..aec9216 100644 --- a/mh-e/tm-mh-e.el +++ b/mh-e/tm-mh-e.el @@ -9,7 +9,7 @@ ;;; modified by YAMAOKA Katsumi ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1993/11/21 (obsolete mh-e-mime.el) -;;; Version: $Revision: 7.46 $ +;;; Version: $Revision: 7.47 $ ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -47,7 +47,7 @@ ;;; (defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 7.46 1996/01/23 04:51:18 morioka Exp $") + "$Id: tm-mh-e.el,v 7.47 1996/01/25 15:14:27 morioka Exp $") (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) @@ -121,6 +121,7 @@ system MH lib directory.") ) (set-buffer-modified-p nil) (setq buffer-read-only t) + (setq buffer-file-name msg-filename) (mh-show-mode) (mime/viewer-mode nil nil nil aname (concat "show-" folder)) @@ -153,11 +154,11 @@ system MH lib directory.") ) (set-buffer-modified-p nil) (setq buffer-read-only t) + (setq buffer-file-name msg-filename) (mh-show-mode) )) (or (eq buffer-undo-list t) ;don't save undo info for prev msgs (setq buffer-undo-list nil)) - (setq buffer-file-name msg-filename) (set-mark nil) (setq mode-line-buffer-identification (list (format mh-show-buffer-mode-line-buffer-id diff --git a/mk-tm b/mk-tm index 32e7a7c..a37059a 100644 --- a/mk-tm +++ b/mk-tm @@ -113,7 +113,20 @@ (if (string-match "XEmacs" emacs-version) (setq tm-modules (append tm-modules '("tm-image"))) - ) + (if (boundp 'MULE) + (if (catch 'tag + (let ((paths load-path) path) + (while paths + (setq path (expand-file-name "bitmap.el" (car paths))) + (if (file-exists-p path) + (throw 'tag path) + ) + (setq paths (cdr paths)) + ))) + (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 (mapcar (function (lambda (module) diff --git a/tm-bbdb.el b/tm-bbdb.el index b208d28..251ab7f 100644 --- a/tm-bbdb.el +++ b/tm-bbdb.el @@ -5,7 +5,7 @@ ;;; ;;; Author: KOBAYASHI Shuhei ;;; Maintainer: MORIOKA Tomohiko -;;; Version: $Id: tm-bbdb.el,v 3.0 1996/01/24 02:20:25 morioka Exp $ +;;; Version: $Id: tm-bbdb.el,v 4.0 1996/01/26 08:20:29 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB ;;; ;;; This file is part of tm (Tools for MIME). @@ -44,6 +44,8 @@ (while (and phrase methods) (setq phrase (funcall (car methods) phrase) methods (cdr methods))) + (if (string= phrase "") + (setq phrase nil)) (cons phrase address) )) @@ -61,7 +63,8 @@ (or (fboundp 'tm:bbdb-extract-field-value) (progn ;; (require 'bbdb-hooks) ; not provided. - (or (fboundp 'bbdb-extract-field-value) + ;; (or (fboundp 'bbdb-extract-field-value) ; defined as autoload + (or (fboundp 'bbdb-header-start) (load "bbdb-hooks")) (fset 'tm:bbdb-extract-field-value (symbol-function 'bbdb-extract-field-value)) @@ -99,12 +102,10 @@ (mapconcat 'identity dest " ") )) -(defvar tm-bbdb/canonicalize-full-name-methods nil) - -(setq tm-bbdb/canonicalize-full-name-methods - '(mime-eword/decode-string - tm-bbdb/canonicalize-dots - tm-bbdb/canonicalize-spaces)) +(defvar tm-bbdb/canonicalize-full-name-methods + '(mime-eword/decode-string + tm-bbdb/canonicalize-dots + tm-bbdb/canonicalize-spaces)) ;;; @ BBDB functions for mime/viewer-mode @@ -118,9 +119,9 @@ Creating or modifying it as necessary. A record will be created if tm-bbdb/auto-create-p is non-nil, or if OFFER-TO-CREATE is non-nil and the user confirms the creation." (save-excursion - (and mime::article/preview-buffer - (get-buffer mime::article/preview-buffer) - (set-buffer mime::article/preview-buffer)) + (if (and mime::article/preview-buffer + (get-buffer mime::article/preview-buffer)) + (set-buffer mime::article/preview-buffer)) (if bbdb-use-pop-up (tm-bbdb/pop-up-bbdb-buffer offer-to-create) (let ((from (rfc822/get-field-body "From"))) diff --git a/tm-ew-d.el b/tm-ew-d.el index 8d6150f..d7a5145 100644 --- a/tm-ew-d.el +++ b/tm-ew-d.el @@ -4,13 +4,13 @@ ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. ;;; Copyright (C) 1992 ENAMI Tsugutomo -;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko +;;; 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.6 $ +;;; Version: $Revision: 7.8 $ ;;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -41,7 +41,7 @@ ;;; (defconst tm-ew-d/RCS-ID - "$Id: tm-ew-d.el,v 7.6 1995/12/06 08:15:51 morioka Exp $") + "$Id: tm-ew-d.el,v 7.8 1996/01/25 06:36:44 morioka Exp $") (defconst mime/eword-decoder-version (get-version-string tm-ew-d/RCS-ID)) @@ -69,14 +69,18 @@ (setq str (rfc822/unfolding-string str)) (let ((dest "")(ew nil) beg end) - (while (setq beg (string-match mime/encoded-word-regexp str)) + (while (and (string-match mime/encoded-word-regexp str) + (setq beg (match-beginning 0) + end (match-end 0)) + ) (if (> beg 0) - (if (not (and (eq ew t) (string= (substring str 0 beg) " "))) - (setq dest (concat dest (substring str 0 beg) - )) + (if (not + (and (eq ew t) + (string-match "^[ \t]+$" (substring str 0 beg)) + )) + (setq dest (concat dest (substring str 0 beg))) ) ) - (setq end (match-end 0)) (setq dest (concat dest (mime/decode-encoded-word (substring str beg end)) )) diff --git a/tm-image.el b/tm-image.el index b81bf86..44bf3e4 100644 --- a/tm-image.el +++ b/tm-image.el @@ -1,14 +1,14 @@ ;;; ;;; tm-image.el --- a tm-view content filter to display images in -;;; XEmacs buffers +;;; XEmacs or Mule buffers ;;; -;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; Copyright (C) 1995,1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/15 ;;; Version: -;;; $Id: tm-image.el,v 2.0 1995/12/17 12:50:26 morioka Exp $ +;;; $Id: tm-image.el,v 4.0 1996/01/31 17:15:55 morioka Exp $ ;;; ;;; Keywords: mail, news, MIME, multimedia, image, picture ;;; @@ -28,26 +28,65 @@ ;;; along with This program. If not, write to the Free Software ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; +;;; Commentary: +;;; If you use this program with Mule, please install bitmap +;;; extension package. It is available from +;;; ftp://etlport.etl.go.jp/pub/mule/contrib/bitmap.tar.gz +;;; ;;; Code: (require 'tm-view) -(require 'xpm) -(require 'annotations) + +(cond ((string-match "XEmacs" emacs-version) + (require 'xpm) + (require 'annotations) + + (set-alist 'mime-viewer/content-filter-alist + "image/jpeg" (function mime-preview/filter-for-image)) + + (set-alist 'mime-viewer/content-filter-alist + "image/gif" (function mime-preview/filter-for-image)) + + (set-alist 'mime-viewer/content-filter-alist + "image/tiff" (function mime-preview/filter-for-image)) + (set-alist 'mime-viewer/content-filter-alist + "image/x-tiff" (function mime-preview/filter-for-image)) + + (set-alist 'mime-viewer/content-filter-alist + "image/x-pic" (function mime-preview/filter-for-image)) + + (set-alist 'mime-viewer/content-filter-alist + "image/x-mag" (function mime-preview/filter-for-image)) + + (defvar tm-image/inline-image-types + '("image/jpeg" "image/gif" "image/tiff" + "image/x-tiff" "image/x-pic" "image/x-mag" "image/x-xbm")) + + (defun bitmap-read-xbm (file) + (let ((gl (make-glyph file))) + (make-annotation gl (point) 'text) + )) + ) + ((boundp 'MULE) + (require 'bitmap) + + (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm")) + )) (defvar mime-viewer/shell-command "/bin/sh") (defvar mime-viewer/shell-arguments '("-c")) -(setq mime-viewer/graphic-converter-alist - '(("image/jpeg" . "djpeg -color 256 < %s | ppmtoxpm > %s") - ("image/gif" . "giftopnm < %s | ppmtoxpm > %s") - ("image/tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-pic" . "pictoppm < %s | ppmquant 256 | ppmtoxpm > %s") - ("image/x-mag" . "magtoppm < %s | ppmtoxpm > %s") - )) +(defvar mime-viewer/graphic-converter-alist + '(("image/jpeg" . "djpeg -color 256 < %s | ppmtoxpm > %s") + ("image/gif" . "giftopnm < %s | ppmtoxpm > %s") + ("image/tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") + ("image/x-tiff" . "tifftopnm < %s | ppmquant 256 | ppmtoxpm > %s") + ("image/x-pic" . "pictoppm < %s | ppmquant 256 | ppmtoxpm > %s") + ("image/x-mag" . "magtoppm < %s | ppmtoxpm > %s") + )) -;;; @ content filter for JPEG +;;; @ content filter for images ;;; (defun mime-preview/filter-for-image (ctype params encoding) @@ -82,23 +121,6 @@ (message (format "%s is not supported." ctype)) ))) -(set-alist 'mime-viewer/content-filter-alist - "image/jpeg" (function mime-preview/filter-for-image)) - -(set-alist 'mime-viewer/content-filter-alist - "image/gif" (function mime-preview/filter-for-image)) - -(set-alist 'mime-viewer/content-filter-alist - "image/tiff" (function mime-preview/filter-for-image)) -(set-alist 'mime-viewer/content-filter-alist - "image/x-tiff" (function mime-preview/filter-for-image)) - -(set-alist 'mime-viewer/content-filter-alist - "image/x-pic" (function mime-preview/filter-for-image)) - -(set-alist 'mime-viewer/content-filter-alist - "image/x-mag" (function mime-preview/filter-for-image)) - ;;; @ content filter for xbm ;;; @@ -109,13 +131,12 @@ (charset (assoc "charset" params)) (beg (point-min)) (end (point-max)) (xbm-file (make-temp-name (expand-file-name "tm" mime/tmp-dir))) - gl annot) + ) (remove-text-properties beg end '(face nil)) (mime/decode-region encoding beg end) (write-region (point-min)(point-max) xbm-file) (delete-region (point-min)(point-max)) - (setq gl (make-glyph xbm-file)) - (setq annot (make-annotation gl (point) 'text)) + (bitmap-read-xbm xbm-file) (delete-file xbm-file) )) @@ -136,11 +157,12 @@ (cons ctype mime-viewer/default-showing-Content-Type-list)) )) - '("image/jpeg" "image/gif" "image/tiff" - "image/x-tiff" "image/x-pic" "image/x-mag" "image/x-xbm")) + tm-image/inline-image-types) ;;; @ end ;;; (provide 'tm-image) + +;;; tm-image.el ends here diff --git a/tm-play.el b/tm-play.el index 175a66b..d4e092e 100644 --- a/tm-play.el +++ b/tm-play.el @@ -2,13 +2,13 @@ ;;; tm-play.el --- decoder for tm-view.el ;;; ;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko ;;; ;;; Author: MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/9/26 (separated from tm-view.el) ;;; Version: -;;; $Id: tm-play.el,v 7.11 1995/12/21 18:11:03 morioka Exp $ +;;; $Id: tm-play.el,v 7.12 1996/01/25 08:29:22 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia ;;; ;;; This file is part of tm (Tools for MIME). @@ -140,10 +140,14 @@ (lambda (arg) (if (stringp arg) arg - (let ((ret (cdr (assoc (eval arg) cal)))) + (let* ((item (eval arg)) + (ret (cdr (assoc item cal))) + ) (if ret ret - "") + (if (eq item 'encoding) + "7bit" + "")) )) )) format)) @@ -396,3 +400,5 @@ ;;; (provide 'tm-play) + +;;; tm-play.el ends here diff --git a/tm-vm.el b/tm-vm.el index a9718ed..bb6e480 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -12,7 +12,7 @@ ;;; and ISHIHARA Akito ;;; Maintainer: Shuhei KOBAYASHI ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.39 $ +;;; Version: $Revision: 7.40 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). @@ -39,7 +39,7 @@ (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.39 1996/01/23 04:46:54 morioka Exp $") + "$Id: tm-vm.el,v 7.40 1996/01/25 05:14:53 morioka Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) @@ -544,7 +544,7 @@ This function is called by `mime-viewer/quit' command via (save-excursion (set-buffer mime::preview/article-buffer) vm-summary-buffer)) - (switch-to-buffer mime::preview/mother-buffer) + (switch-to-buffer mime::preview/article-buffer) (mime-viewer/kill-buffer) (vm-select-folder-buffer) (setq tm-vm/system-state nil)) -- 1.7.10.4