From 1180d8a2d6cb54ad1b944db81924ad7bab4f6b00 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:47:30 +0000 Subject: [PATCH] tm 7.75. --- ChangeLog | 29 ++++++++++++++++++++ Makefile | 2 +- mh-e/ChangeLog | 22 ++++++++++++++++ mh-e/tmh-comp.el | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++---- tm-edit.el | 28 +++----------------- tm-image.el | 13 ++++----- tm-text.el | 4 +-- 7 files changed, 136 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index d33bfa2..aa4f8a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +Thu Aug 1 06:42:04 1996 MORIOKA Tomohiko + + * tl: Version 7.43.2 was released. + * tm: Version 7.75 was released. + * tm/mh-e: Version 7.65.1 was released. + + * tm-image.el: Function `bitmap-show-xbm-file' was renamed to + `bitmap-insert-xbm-file'. + + Function `bitmap-decode-x-face' was renamed to + `x-face-decode-message-header'. + +Wed Jul 31 02:51:16 1996 MORIOKA Tomohiko + + * tm-edit.el (mime-editor/split-message-sender-alist): + implementation for mh-letter-mode was moved to + tm/mh-e/tmh-comp.el. + +Mon Jul 29 01:13:20 1996 MORIOKA Tomohiko + + * tm-text.el (mime-charset/maybe-decode-buffer): + fixed. (cf. [tm-en:629]) + +Fri Jul 26 19:43:26 1996 MORIOKA Tomohiko + + * tm-image.el: Function `bitmap-read-xbm' was renamed to + `bitmap-show-xbm-file'. + + Wed Jul 24 10:33:16 1996 MORIOKA Tomohiko * tm: Version 7.74 was released. diff --git a/Makefile b/Makefile index 0c3016c..c72beee 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES) -TARFILE = tm7.74.tar.gz +TARFILE = tm7.75.tar.gz elc: $(EMACS) $(FLAGS) -l inst-tm -f compile-tm diff --git a/mh-e/ChangeLog b/mh-e/ChangeLog index 733fc9a..4ce54c2 100644 --- a/mh-e/ChangeLog +++ b/mh-e/ChangeLog @@ -1,3 +1,25 @@ +Thu Aug 1 07:43:19 1996 MORIOKA Tomohiko + + * tm/mh-e: Version 7.65.1 was released. + +Wed Jul 31 03:07:43 1996 MORIOKA Tomohiko + + * tmh-comp.el: Implementation for + `mime-editor/split-message-sender-alist' was moved from + tm-edit.el. + +Sun Jul 28 04:23:07 1996 MORIOKA Tomohiko + + * tmh-comp.el (tm-mh-e/yank-cur-msg-with-no-filter): New function. + + * tmh-comp.el: Function `tm-mh-e/yank-cur-msg' was renamed to + `tm-mh-e/yank-current-message'. + + * tmh-comp.el (tm-mh-e/message-yank-function): New variable. + (tm-mh-e/yank-cur-msg): Use variable + `tm-mh-e/message-yank-function'. + + Wed Jul 24 10:07:45 1996 MORIOKA Tomohiko * tm/mh-e: Version 7.65 was released. diff --git a/mh-e/tmh-comp.el b/mh-e/tmh-comp.el index 8f0a385..3e32803 100644 --- a/mh-e/tmh-comp.el +++ b/mh-e/tmh-comp.el @@ -10,7 +10,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1996/2/29 (separated from tm-mh-e.el) ;;; Version: -;;; $Id: tmh-comp.el,v 7.1 1996/06/05 02:34:06 morioka Exp $ +;;; $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). @@ -44,6 +44,8 @@ Default is \"forwcomps\". If not a complete path name, the file is searched for first in the user's MH directory, then in the system MH lib directory.") +(defvar tm-mh-e/message-yank-function 'mh-yank-cur-msg) + ;;; @ for tm-edit ;;; @@ -180,6 +182,31 @@ system MH lib directory.") 'mh-letter-mode (function tm-mh-e/insert-mail)) (set-alist 'mime-editor/mail-inserter-alist 'news-reply-mode (function tm-mh-e/insert-mail)) +(set-alist + 'mime-editor/split-message-sender-alist + 'mh-letter-mode + (function + (lambda (&optional arg) + (interactive "P") + (write-region (point-min) (point-max) + mime-editor/draft-file-name nil 'no-message) + (cond (arg + (pop-to-buffer "MH mail delivery") + (erase-buffer) + (mh-exec-cmd-output mh-send-prog t "-watch" "-nopush" + "-nodraftfolder" + mh-send-args + mime-editor/draft-file-name) + (goto-char (point-max)) ; show the interesting part + (recenter -1) + (sit-for 1)) + (t + (apply 'mh-exec-cmd-quiet t mh-send-prog + (mh-list-to-string + (list "-nopush" "-nodraftfolder" + "-noverbose" "-nowatch" + mh-send-args mime-editor/draft-file-name))))) + ))) ;;; @ commands using tm-edit features @@ -419,8 +446,48 @@ then prompt for the message sequence. See also documentation for (number (tm-mh-e/prompt-for-message "Message number: " folder))) (tm-mh-e::insert-letter folder number verbatim))) -(defun tm-mh-e/yank-cur-msg () - "Interface to mh-yank-cur-msg." +(defun tm-mh-e/yank-cur-msg-with-no-filter () + "Insert the current message into the draft buffer. +This function makes new show-buffer from article-buffer to disable +variable `mime-viewer/plain-text-preview-hook'. If you don't want to +use text filters for replying message, please set it to +`tm-mh-e/message-yank-function'. +Prefix each non-blank line in the message with the string in +`mh-ins-buf-prefix'. The entire message will be inserted if +`mh-yank-from-start-of-msg' is non-nil. If this variable is nil, the +portion of the message following the point will be yanked. If +`mh-delete-yanked-msg-window' is non-nil, any window displaying the +yanked message will be deleted." + (interactive) + (if (and mh-sent-from-folder mh-sent-from-msg) + (let ((to-point (point)) + (to-buffer (current-buffer))) + (set-buffer mh-sent-from-folder) + (if mh-delete-yanked-msg-window + (delete-windows-on mh-show-buffer)) + (set-buffer mh-show-buffer) ; Find displayed message + (let ((mh-ins-str + (let (mime-viewer/plain-text-preview-hook buf) + (prog1 + (save-window-excursion + (set-buffer mime::preview/article-buffer) + (setq buf (mime/viewer-mode)) + (buffer-string) + ) + (kill-buffer buf))))) + (set-buffer to-buffer) + (save-restriction + (narrow-to-region to-point to-point) + (push-mark) + (insert mh-ins-str) + (mh-insert-prefix-string mh-ins-buf-prefix) + (insert "\n")))) + (error "There is no current message"))) + +(defun tm-mh-e/yank-current-message () + "Insert the current message into the draft buffer. +It uses variable `tm-mh-e/message-yank-function' +to select message yanking function." (interactive) (let ((mh-sent-from-folder mh-sent-from-folder) (mh-sent-from-msg mh-sent-from-msg)) @@ -441,11 +508,11 @@ then prompt for the message sequence. See also documentation for (set-buffer gnus-article-buffer) (setq mh-show-buffer (current-buffer)) ))) - (mh-yank-cur-msg) + (funcall tm-mh-e/message-yank-function) )) (substitute-key-definition - 'mh-yank-cur-msg 'tm-mh-e/yank-cur-msg mh-letter-mode-map) + 'mh-yank-cur-msg 'tm-mh-e/yank-current-message mh-letter-mode-map) (substitute-key-definition 'mh-insert-letter 'tm-mh-e/insert-letter mh-letter-mode-map) diff --git a/tm-edit.el b/tm-edit.el index 278853d..5e2eff6 100644 --- a/tm-edit.el +++ b/tm-edit.el @@ -8,7 +8,7 @@ ;;; MORIOKA Tomohiko ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1994/08/21 renamed from mime.el -;;; Version: $Revision: 7.74 $ +;;; Version: $Revision: 7.75 $ ;;; Keywords: mail, news, MIME, multimedia, multilingual ;;; ;;; This file is part of tm (Tools for MIME). @@ -122,7 +122,7 @@ ;;; (defconst mime-editor/RCS-ID - "$Id: tm-edit.el,v 7.74 1996/07/24 10:27:07 morioka Exp $") + "$Id: tm-edit.el,v 7.75 1996/07/31 02:51:16 morioka Exp $") (defconst mime-editor/version (get-version-string mime-editor/RCS-ID)) @@ -417,29 +417,7 @@ Each elements are regexp of field-name. [tm-edit.el]") (defvar mime-editor/split-blind-field-regexp "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)") -(defvar mime-editor/split-message-sender-alist - '((mh-letter-mode - . (lambda (&optional arg) - (interactive "P") - (write-region (point-min) (point-max) - mime-editor/draft-file-name nil 'no-message) - (cond (arg - (pop-to-buffer "MH mail delivery") - (erase-buffer) - (mh-exec-cmd-output mh-send-prog t "-watch" "-nopush" - "-nodraftfolder" - mh-send-args mime-editor/draft-file-name) - (goto-char (point-max)) ; show the interesting part - (recenter -1) - (sit-for 1)) - (t - (apply 'mh-exec-cmd-quiet t mh-send-prog - (mh-list-to-string - (list "-nopush" "-nodraftfolder" - "-noverbose" "-nowatch" - mh-send-args mime-editor/draft-file-name))))) - )) - )) +(defvar mime-editor/split-message-sender-alist nil) (defvar mime-editor/news-reply-mode-server-running nil) diff --git a/tm-image.el b/tm-image.el index 384269b..ecc9fc7 100644 --- a/tm-image.el +++ b/tm-image.el @@ -10,7 +10,7 @@ ;;; Maintainer: MORIOKA Tomohiko ;;; Created: 1995/12/15 ;;; Version: -;;; $Id: tm-image.el,v 7.10 1996/07/15 19:21:48 morioka Exp $ +;;; $Id: tm-image.el,v 7.12 1996/08/01 06:42:04 morioka Exp $ ;;; ;;; Keywords: mail, news, MIME, multimedia, image, picture ;;; @@ -84,7 +84,7 @@ ) ))) - (defun bitmap-read-xbm (file) + (defun bitmap-insert-xbm-file (file) (let (gl) (while (progn (setq gl (make-glyph file)) @@ -114,11 +114,12 @@ )) ) ((boundp 'MULE) - (require 'bitmap) + (require 'x-face-mule) (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm")) - (defvar mime-preview/x-face-function (function bitmap-decode-x-face)) + (defvar mime-preview/x-face-function + (function x-face-decode-message-header)) )) (defvar mime-viewer/shell-command "/bin/sh") @@ -169,7 +170,7 @@ xbm-file)) (while (not (file-exists-p xbm-file))) (delete-region beg end) - (bitmap-read-xbm xbm-file) + (bitmap-insert-xbm-file xbm-file) (condition-case nil (delete-file xbm-file) (error nil)) @@ -230,7 +231,7 @@ (mime-decode-region beg end encoding) (write-region (point-min)(point-max) xbm-file) (delete-region (point-min)(point-max)) - (bitmap-read-xbm xbm-file) + (bitmap-insert-xbm-file xbm-file) (delete-file xbm-file) )) diff --git a/tm-text.el b/tm-text.el index 058c0e8..613aa6e 100644 --- a/tm-text.el +++ b/tm-text.el @@ -8,7 +8,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-text.el,v 7.20 1996/07/18 12:46:20 morioka Exp $ +;;; $Id: tm-text.el,v 7.21 1996/07/29 01:13:20 morioka Exp $ ;;; Keywords: mail, news, MIME, multimedia, text ;;; ;;; This file is part of tm (Tools for MIME). @@ -45,7 +45,7 @@ (defun mime-charset/maybe-decode-buffer (charset &optional encoding) (or (member encoding '(nil "7bit" "8bit" "binary")) - (mime-charset/decode-buffer beg end charset) + (mime-charset/decode-buffer charset) )) (defun mime-preview/decode-text-buffer (charset encoding) -- 1.7.10.4