+Wed Jan 31 17:15:55 1996 Morioka Tomohiko <morioka@jaist.ac.jp>
+
+ * 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 <shuhei@cmpt01.phys.tohoku.ac.jp>
+
+ * 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 <morioka@jaist.ac.jp>
+
+ * 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 <morioka@jaist.ac.jp>
+
+ * tm-ew-d.el (mime-eword/decode-string): set to `end' just
+ string-matched.
+
+Thu Jan 25 06:22:17 1996 Morioka Tomohiko <morioka@jaist.ac.jp>
+
+ * 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])
+
+\f
Thu Jan 25 03:24:35 1996 Morioka Tomohiko <morioka@jaist.ac.jp>
* tl: Version 7.10 was released.
FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
-TARFILE = tm7.41.2.tar.gz
+TARFILE = tm7.41.3.tar.gz
18:
+Thu Jan 25 15:00:14 1996 Michael Sperber <sperber@informatik.uni-tuebingen.de>
+
+ * 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 <morioka@jaist.ac.jp>
* tm/mh-e: Version 7.46 was released.
;;; modified by YAMAOKA Katsumi <yamaoka@ga.sony.co.jp>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; 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).
;;;
(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))
)
(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))
)
(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
(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)
;;;
;;; Author: KOBAYASHI Shuhei <shuhei@cmpt01.phys.tohoku.ac.jp>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; 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).
(while (and phrase methods)
(setq phrase (funcall (car methods) phrase)
methods (cdr methods)))
+ (if (string= phrase "")
+ (setq phrase nil))
(cons phrase address)
))
(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))
(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
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")))
;;;
;;; 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 <enami@sys.ptg.sony.co.jp>
;;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; 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).
;;;
(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))
(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))
))
;;;
;;; 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 <morioka@jaist.ac.jp>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; 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
;;;
;;; 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)
(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
;;;
(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)
))
(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
;;; 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 <morioka@jaist.ac.jp>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; 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).
(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))
;;;
(provide 'tm-play)
+
+;;; tm-play.el ends here
;;; and ISHIHARA Akito <aki@bpel.tutics.tut.ac.jp>
;;; Maintainer: Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
;;; 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).
(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)
(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))
projects / elisp / tm.git / commitdiff