+Fri Apr 26 05:31:57 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tl: Version 7.22 was released.
+ * tm: Version 7.54 was released.
+ * tm/mh-e: Version 7.59 was released.
+
+ * tm-rich.el (tm-rich/richtext-module): Version check for
+ enriched.el was fixed for XEmacs 19.14.
+
+Fri Apr 26 04:20:52 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tm-image.el (mime-preview/x-face-function): Use function
+ `bitmap-decode-x-face' when running Mule.
+
+Thu Apr 25 22:17:47 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tm-view.el (mime-viewer/follow-content): New implementation;
+ interface of `mime-viewer/following-method-alist' was changed.
+
+ * tm-def.el (mime/convert-string-to-emacs): fixed.
+ (mime/convert-string-from-emacs): fixed.
+
+\f
Thu Apr 25 12:10:01 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* tl: Version 7.19.3 was released.
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/*.el \
+TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \
+ tl/*.el tl/*.bdf \
tl/doc/*.texi tl/ChangeLog
FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
-TARFILE = tm7.52.2.tar.gz
+TARFILE = tm7.54.tar.gz
elc:
$(EMACS) $(FLAGS) -l inst-tm -f compile-tm
+Fri Apr 26 04:47:43 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tm/mh-e: Version 7.59 was released.
+
+Thu Apr 25 22:19:02 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tm-mh-e.el (tm-mh-e/following-method): new implementation for
+ tm-view 7.53.
+
+Thu Apr 25 15:38:16 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tmh-comp.el (tm-mh-e/yank-cur-msg): don't call `error'.
+
+\f
Mon Apr 22 12:52:17 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* tm/mh-e: Version 7.58 was released.
FILES = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
-TARFILE = tm-mh-e7.58.tar
+TARFILE = tm-mh-e7.59.tar
elc:
;;; 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.58 $
+;;; Version: $Revision: 7.59 $
;;; 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.58 1996/04/21 17:11:20 morioka Exp $")
+ "$Id: tm-mh-e.el,v 7.59 1996/04/25 22:19:02 morioka Exp $")
(defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
;; (add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration)
-(defun tm-mh-e/following-method (to cc subj)
- (let ((buf (current-buffer)))
+(defun tm-mh-e/following-method (buf)
+ (save-excursion
+ (set-buffer buf)
+ (goto-char (point-max))
(setq mh-show-buffer buf)
- (mh-send (or to "") (or cc "") (or subj ""))
+ (apply (function mh-send)
+ (rfc822/get-field-bodies '("To" "cc" "Subject") ""))
(setq mh-sent-from-folder buf)
(setq mh-sent-from-msg 1)
(let ((last (point)))
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; Created: 1996/2/29 (separated from tm-mh-e.el)
;;; Version:
-;;; $Id: tmh-comp.el,v 3.0 1996/03/25 11:56:31 morioka Exp $
+;;; $Id: tmh-comp.el,v 4.0 1996/04/25 15:38:16 morioka Exp $
;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual
;;;
;;; This file is part of tm (Tools for MIME).
(interactive)
(let ((mh-sent-from-folder mh-sent-from-folder)
(mh-sent-from-msg mh-sent-from-msg))
- (if (not (stringp mh-sent-from-folder))
- (cond ((and (boundp 'gnus-article-buffer)
- (get-buffer gnus-article-buffer)
- (bufferp mh-sent-from-folder)
- ) ; might be called from GNUS
- (if (boundp 'gnus-article-copy) ; might be sgnus
- (save-excursion
- (gnus-copy-article-buffer)
- (setq mh-sent-from-folder gnus-article-copy)
- (set-buffer mh-sent-from-folder)
- (setq mh-show-buffer gnus-article-copy))
- (save-excursion
- (setq mh-sent-from-folder gnus-article-buffer)
- (set-buffer gnus-article-buffer)
- (setq mh-show-buffer (current-buffer)))))
- (t
- (error "There is no current message"))))
- (mh-yank-cur-msg)))
+ (if (and (not (stringp mh-sent-from-folder))
+ (boundp 'gnus-article-buffer)
+ (get-buffer gnus-article-buffer)
+ (bufferp mh-sent-from-folder)
+ ) ; might be called from GNUS
+ (if (boundp 'gnus-article-copy) ; might be sgnus
+ (save-excursion
+ (gnus-copy-article-buffer)
+ (setq mh-sent-from-folder gnus-article-copy)
+ (set-buffer mh-sent-from-folder)
+ (setq mh-show-buffer gnus-article-copy)
+ )
+ (save-excursion
+ (setq mh-sent-from-folder gnus-article-buffer)
+ (set-buffer gnus-article-buffer)
+ (setq mh-show-buffer (current-buffer))
+ )))
+ (mh-yank-cur-msg)
+ ))
(substitute-key-definition
'mh-yank-cur-msg 'tm-mh-e/yank-cur-msg mh-letter-mode-map)
;;;
;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; Version:
-;;; $Id: tm-def.el,v 7.34 1996/04/23 00:15:47 morioka Exp $
+;;; $Id: tm-def.el,v 7.35 1996/04/25 14:29:51 morioka Exp $
;;; Keywords: mail, news, MIME, multimedia, definition
;;;
;;; This file is part of tm (Tools for MIME).
(defvar mime/default-coding-system *ctext*)
(defun mime/convert-string-to-emacs (str charset)
- (let ((cs (cdr (assoc charset mime/charset-coding-system-alist))))
+ (let ((cs (assoc charset mime/charset-coding-system-alist)))
(if cs
- (code-convert-string str cs *internal*)
+ (code-convert-string str (cdr cs) *internal*)
)))
(defun mime/convert-string-from-emacs (str charset)
- (let ((cs (cdr (assoc charset mime/charset-coding-system-alist))))
+ (let ((cs (assoc charset mime/charset-coding-system-alist)))
(if cs
- (code-convert-string str *internal* cs)
+ (code-convert-string str *internal* (cdr cs))
)))
(defun mime/code-convert-region-to-emacs (beg end charset &optional encoding)
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; Created: 1995/12/15
;;; Version:
-;;; $Id: tm-image.el,v 7.2 1996/04/14 00:14:46 morioka Exp $
+;;; $Id: tm-image.el,v 7.3 1996/04/26 04:20:52 morioka Exp $
;;;
;;; Keywords: mail, news, MIME, multimedia, image, picture
;;;
(defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
- (defvar mime-preview/x-face-function
- (function mime-preview/x-face-function-for-mule))
+ (defvar mime-preview/x-face-function (function bitmap-decode-x-face))
))
(defvar mime-viewer/shell-command "/bin/sh")
(error nil))
))))
-(defun mime-preview/x-face-function-for-mule ()
- (save-restriction
- (narrow-to-region (point-min)
- (if (re-search-forward "^$" nil t)
- (match-end 0)
- (point-max)
- ))
- (goto-char (point-min))
- (if (re-search-forward "^X-Face:[ \t]*" nil t)
- (let ((p (match-beginning 0))
- (beg (match-end 0))
- (end (rfc822/field-end))
- (xbm-file
- (concat
- (make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
- ".xbm")
- ))
- (if (< end (point-max))
- (setq end (1+ end))
- )
- (while (progn
- (call-process-region
- beg end "sh" nil 0 nil
- "-c"
- (format "%s > %s"
- mime-viewer/x-face-to-xbm-command
- xbm-file))
- (not (file-exists-p xbm-file))
- ))
- (save-restriction
- (narrow-to-region p end)
- (delete-region p end)
- (goto-char p)
- (while (progn
- (condition-case nil
- (bitmap-read-xbm xbm-file)
- (error nil))
- (kill-buffer
- (some-element
- (function
- (lambda (buf)
- (string-equal (buffer-file-name buf) xbm-file)
- ))
- (buffer-list)))
- (= (point-min) (point-max))
- ))
- (goto-char p)
- (insert "X-Face: ")
- (while (re-search-forward "^." nil t)
- (goto-char (match-beginning 0))
- (insert " ")
- ))
- (condition-case nil
- (delete-file xbm-file)
- (error nil))
- ))))
-
;;; @ content filter for images
;;;
;;; richtext filter for tm-view
;;;
;;; 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>
;;; Version:
-;;; $Id: tm-rich.el,v 7.1 1995/10/20 10:40:06 morioka Exp $
+;;; $Id: tm-rich.el,v 7.4 1996/04/26 05:31:57 morioka Exp $
;;; Keywords: mail, news, MIME, multimedia, richtext, enriched
;;;
;;; 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 'tm-view)
-
(defvar tm-rich/richtext-module
- (if (or (< emacs-major-version 19)
- (and (= emacs-major-version 19)
- (< emacs-minor-version 29))
- )
- 'tinyrich
- 'richtext))
+ (if (or running-emacs-19_29-or-later
+ running-xemacs-20
+ (and running-xemacs (>= emacs-minor-version 14)))
+ 'richtext
+ 'tinyrich))
+
(require tm-rich/richtext-module)
(provide 'tm-rich)
(run-hooks 'tm-rich-load-hook)
+
+;;; tm-rich.el ends here
;;; modified by Steven L. Baur <steve@miranova.com>
;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;;; Version: $Revision: 7.52 $
+;;; Version: $Revision: 7.54 $
;;; Keywords: mail, news, MIME, multimedia
;;;
;;; This file is part of tm (Tools for MIME).
;;;
(defconst mime-viewer/RCS-ID
- "$Id: tm-view.el,v 7.52 1996/04/23 22:52:55 morioka Exp $")
+ "$Id: tm-view.el,v 7.54 1996/04/25 22:43:33 morioka Exp $")
(defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
(defconst mime/viewer-version mime-viewer/version)
(new-name (format "%s-%s" (buffer-name) (reverse rcnum)))
new-buf
(the-buf (current-buffer))
- from to cc reply-to subj mid f)
- (save-excursion
- (set-buffer mime::preview/article-buffer)
- (setq from (rfc822/get-field-body "From")
- to (rfc822/get-field-body "To")
- cc (rfc822/get-field-body "cc")
- reply-to (rfc822/get-field-body "Reply-To")
- subj (rfc822/get-field-body "Subject")
- mid (rfc822/get-field-body "Message-Id")
- ))
+ (a-buf mime::preview/article-buffer)
+ (hb (mime::content-info/point-min cinfo))
+ (he (mime::content-info/point-max cinfo))
+ fields from to cc reply-to subj mid f)
(save-excursion
(set-buffer (setq new-buf (get-buffer-create new-name)))
(erase-buffer)
(insert-buffer-substring the-buf p-beg p-end)
(goto-char (point-min))
(if (mime-viewer/header-visible-p rcnum root-cinfo)
- (setq mid nil)
- (insert "\n")
+ (delete-region (goto-char (point-min))
+ (if (re-search-forward "^$" nil t)
+ (match-end 0)
+ (point-min)))
)
(goto-char (point-min))
- (if (setq f (rfc822/get-field-body "From"))
- (setq from f)
- (and from
- (insert (format "From: %s\n"
- (mime-eword/decode-string from)))
- ))
- (if (setq f (rfc822/get-field-body "To"))
- (setq to f)
- (and to
- (insert (format "To: %s\n"
- (mime-eword/decode-string to)))
- ))
- (if (setq f (rfc822/get-field-body "cc"))
- (setq cc f)
- (and cc
- (insert (format "cc: %s\n"
- (mime-eword/decode-string cc)))
- ))
- (if (setq f (rfc822/get-field-body "Reply-To"))
- (setq reply-to f)
- (and reply-to
- (insert (format "Reply-To: %s\n"
- (mime-eword/decode-string reply-to)))
- ))
- (if (setq f (or (rfc822/get-field-body "Subject")
- (rfc822/get-field-body "Content-Description")))
- (setq subj f)
- (and subj
- (insert (format "Subject: %s\n"
- (mime-eword/decode-string subj)))
- ))
- (if (setq f (rfc822/get-field-body "Message-Id"))
- (setq mid f)
- (and mid
- (insert (format "Message-Id: %s\n"
- (mime-eword/decode-string mid)))
- ))
- (goto-char (point-max))
- (funcall (cdr (assq mode mime-viewer/following-method-alist))
- (or reply-to
- (if (string-equal
- (nth 1 (rfc822/extract-address-components from))
- user-mail-address)
- to
- from))
- cc (and subj
- (if (string-match "^Re:" subj)
- subj
- (concat "Re: " subj))
- ))
- )))))
+ (insert "\n")
+ (goto-char (point-min))
+ (let ((rcnum (mime::content-info/rcnum cinfo)) ci str)
+ (while (progn
+ (setq str
+ (save-excursion
+ (set-buffer a-buf)
+ (setq ci (mime-article/rcnum-to-cinfo rcnum))
+ (save-restriction
+ (narrow-to-region
+ (mime::content-info/point-min ci)
+ (mime::content-info/point-max ci)
+ )
+ (rfc822/get-header-string-except
+ (concat "^"
+ (apply (function regexp-or) fields)
+ ":") ""))))
+ (if (string-equal (mime::content-info/type ci)
+ "message/rfc822")
+ nil
+ (if str
+ (insert str)
+ )
+ rcnum))
+ (setq fields (rfc822/get-field-names)
+ rcnum (cdr rcnum))
+ )
+ )
+ (mime/decode-message-header)
+ )
+ (funcall (cdr (assq mode mime-viewer/following-method-alist))
+ new-buf)
+ ))))
(defun mime-viewer/display-x-face ()
(interactive)
projects / elisp / tm.git / commitdiff