X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-vm.el;h=361d481567580b9267e8c58c2298401a63832de7;hb=cd47eed235f4258380f6d9b401c2fb1fc884931c;hp=e99e644c48ef2dffb45c6fdf0e69b7d3dad705aa;hpb=70061cd3b20d164db66fed000c40db6fc6c2e34e;p=elisp%2Ftm.git diff --git a/tm-vm.el b/tm-vm.el index e99e644..361d481 100644 --- a/tm-vm.el +++ b/tm-vm.el @@ -4,23 +4,23 @@ ;;; Copyright (C) 1994 MASUTANI Yasuhiro ;;; Copyright (C) 1995 WAKAMIYA Kenji ;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei -;;; +;;; Copyright (C) 1996 Oscar Figueiredo +;;; ;;; Author: MASUTANI Yasuhiro ;;; Kenji Wakamiya ;;; MORIOKA Tomohiko -;;; Shuhei KOBAYASHI +;;; KOBAYASHI Shuhei ;;; Oscar Figueiredo ;;; modified by SHIONO Jun'ichi -;;; and ISHIHARA Akito -;;; Maintainer: Shuhei KOBAYASHI +;;; ISHIHARA Akito +;;; Rob Kooper +;;; Maintainer: KOBAYASHI Shuhei ;;; Created: 1994/10/29 -;;; Version: $Revision: 7.44 $ +;;; Version: $Revision: 7.54 $ ;;; Keywords: mail, MIME, multimedia, multilingual, encoded-word ;;; ;;; This file is part of tm (Tools for MIME). ;;; -;;; Plese insert `(require 'tm-vm)' in your ~/.vm file. -;;; ;;; 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 @@ -35,19 +35,26 @@ ;;; along with This program. If not, write to the Free Software ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; +;;; Commentary: +;;; +;;; Plese insert `(require 'tm-vm)' in your ~/.vm file. +;;; ;;; Code: (require 'tm-view) (require 'vm) (defconst tm-vm/RCS-ID - "$Id: tm-vm.el,v 7.44 1996/02/23 22:00:46 morioka Exp $") + "$Id: tm-vm.el,v 7.54 1996/06/12 23:46:24 shuhei-k Exp $") (defconst tm-vm/version (get-version-string tm-vm/RCS-ID)) (define-key vm-mode-map "Z" 'tm-vm/view-message) (define-key vm-mode-map "T" 'tm-vm/decode-message-header) (define-key vm-mode-map "\et" 'tm-vm/toggle-preview-mode) +(defvar tm-vm/use-original-url-button nil + "*If it is t, use original URL button instead of tm's.") + (defvar tm-vm-load-hook nil "*List of functions called after tm-vm is loaded.") @@ -100,7 +107,7 @@ If you use tiny-mime patch for VM (by RIKITAKE Kenji )) (defun tm-vm/decode-message-header (&optional count) - "Decode MIME header of current message through tiny-mime. + "Decode MIME header of current message. Numeric prefix argument COUNT means to decode the current message plus the next COUNT-1 messages. A negative COUNT means decode the current message and the previous COUNT-1 messages. @@ -231,7 +238,9 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") (point) )) (mime/viewer-mode) - (goto-char (point-min)) + (if (and tm-vm/use-original-url-button + vm-use-menus (vm-menu-support-possible-p)) + (vm-energize-urls)) ;; 1996/2/16, fixed by ;; Oscar Figueiredo ;; Highlight message (and display XFace if supported) @@ -239,8 +248,8 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") (and (vm-xemacs-p) vm-use-lucid-highlighting)) (vm-highlight-headers)) ;; - (narrow-to-region (point) - (search-forward "\n\n" nil t)) + (goto-char (point-min)) + (narrow-to-region (point) (search-forward "\n\n" nil t)) )) ;; don't do MIME processing. decode header only. (let (buffer-read-only) @@ -352,7 +361,7 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") (setq mwin (vm-get-buffer-window mbuf) pwin (and pbuf (vm-get-buffer-window pbuf))) (cond - (was-invisible + ((or mp-changed was-invisible) nil ) ((null pbuf) @@ -554,10 +563,228 @@ tm-vm uses `vm-select-message-hook', use this hook instead.") (set-alist 'mime-viewer/over-to-next-method-alist 'vm-virtual-mode 'tm-vm/next-message) +;;; @@ vm-yank-message +;;; +;; 1996/3/28 by Oscar Figueiredo + +(require 'vm-reply) + +(defun vm-yank-message (&optional message) + "Yank message number N into the current buffer at point. +When called interactively N is always read from the minibuffer. When +called non-interactively the first argument is expected to be a +message struct. + +This function originally provided by vm-reply has been patched for TM in +order to provide better citation of MIME messages : if a MIME Preview +buffer is displayed for the message then its contents are inserted +instead of the raw message. + +This command is meant to be used in VM created Mail mode buffers; the +yanked message comes from the mail buffer containing the message you +are replying to, forwarding, or invoked VM's mail command from. + +All message headers are yanked along with the text. Point is +left before the inserted text, the mark after. Any hook +functions bound to mail-citation-hook are run, after inserting +the text and setting point and mark. For backward compatibility, +if mail-citation-hook is set to nil, `mail-yank-hooks' is run +instead. + +If mail-citation-hook and mail-yank-hooks are both nil, this +default action is taken: the yanked headers are trimmed as +specified by vm-included-text-headers and +vm-included-text-discard-header-regexp, and the value of +vm-included-text-prefix is prepended to every yanked line." + (interactive + (list + ;; What we really want for the first argument is a message struct, + ;; but if called interactively, we let the user type in a message + ;; number instead. + (let (mp default + (result 0) + prompt + (last-command last-command) + (this-command this-command)) + (if (bufferp vm-mail-buffer) + (save-excursion + (vm-select-folder-buffer) + (setq default (and vm-message-pointer + (vm-number-of (car vm-message-pointer))) + prompt (if default + (format "Yank message number: (default %s) " + default) + "Yank message number: ")) + (while (zerop result) + (setq result (read-string prompt)) + (and (string= result "") default (setq result default)) + (setq result (string-to-int result))) + (if (null (setq mp (nthcdr (1- result) vm-message-list))) + (error "No such message.")) + (car mp)) + nil)))) + (if (null message) + (if mail-reply-buffer + (tm-vm/yank-content) + (error "This is not a VM Mail mode buffer.")) + (if (null (buffer-name vm-mail-buffer)) + (error "The folder buffer containing message %d has been killed." + (vm-number-of message))) + (vm-display nil nil '(vm-yank-message) + '(vm-yank-message composing-message)) + (setq message (vm-real-message-of message)) + (let ((b (current-buffer)) (start (point)) end) + (save-restriction + (widen) + (save-excursion + (set-buffer (vm-buffer-of message)) + (let* ((mbuf (current-buffer)) + (pbuf (and mime::article/preview-buffer + (get-buffer mime::article/preview-buffer))) + (pwin (and pbuf (vm-get-visible-buffer-window pbuf)))) + (if pwin + (if running-xemacs + (let ((tmp (generate-new-buffer "tm-vm/tmp"))) + (set-buffer pbuf) + (append-to-buffer tmp (point-min) (point-max)) + (set-buffer tmp) + (map-extents + '(lambda (ext maparg) + (set-extent-property ext 'begin-glyph nil))) + (append-to-buffer b (point-min) (point-max)) + (setq end (vm-marker + (+ start (length (buffer-string))) b)) + (kill-buffer tmp)) + (set-buffer pbuf) + (append-to-buffer b (point-min) (point-max)) + (setq end (vm-marker + (+ start (length (buffer-string))) b))) + (save-restriction + (widen) + (append-to-buffer + b (vm-headers-of message) (vm-text-end-of message)) + (setq end + (vm-marker (+ start (- (vm-text-end-of message) + (vm-headers-of message))) b)))))) + (push-mark end) + (cond (mail-citation-hook (run-hooks 'mail-citation-hook)) + (mail-yank-hooks (run-hooks 'mail-yank-hooks)) + (t (vm-mail-yank-default message))) + )) + )) + ;;; @ for tm-view ;;; +;;; based on vm-do-reply [vm-reply.el] +(defun tm-vm/do-reply (buf to-all include-text) + (save-excursion + (set-buffer buf) + (let ((dir default-directory) + to cc subject mp in-reply-to references newsgroups) + (cond ((setq to + (let ((reply-to (rfc822/get-field-body "Reply-To"))) + (if (vm-ignored-reply-to reply-to) + nil + reply-to)))) + ((setq to (rfc822/get-field-body "From"))) + ;; (t (error "No From: or Reply-To: header in message")) + ) + (if to-all + (setq cc (delq nil (cons cc (rfc822/get-field-bodies '("To" "Cc")))) + cc (mapconcat 'identity cc ",")) + ) + (setq subject (rfc822/get-field-body "Subject")) + (and subject vm-reply-subject-prefix + (let ((case-fold-search t)) + (not + (equal + (string-match (regexp-quote vm-reply-subject-prefix) + subject) + 0))) + (setq subject (concat vm-reply-subject-prefix subject))) + (setq in-reply-to (rfc822/get-field-body "Message-Id") + references (nconc + (rfc822/get-field-bodies '("References" "In-Reply-To")) + (list in-reply-to)) + newsgroups (list (or (and to-all + (rfc822/get-field-body "Followup-To")) + (rfc822/get-field-body "Newsgroups")))) + (setq to (vm-parse-addresses to) + cc (vm-parse-addresses cc)) + (if vm-reply-ignored-addresses + (setq to (vm-strip-ignored-addresses to) + cc (vm-strip-ignored-addresses cc))) + (setq to (vm-delete-duplicates to nil t)) + (setq cc (vm-delete-duplicates + (append (vm-delete-duplicates cc nil t) + to (copy-sequence to)) + t t)) + (and to (setq to (mapconcat 'identity to ",\n "))) + (and cc (setq cc (mapconcat 'identity cc ",\n "))) + (and (null to) (setq to cc cc nil)) + (setq references (delq nil references) + references (mapconcat 'identity references " ") + references (vm-parse references "[^<]*\\(<[^>]+>\\)") + references (vm-delete-duplicates references) + references (if references (mapconcat 'identity references "\n\t"))) + (setq newsgroups (delq nil newsgroups) + newsgroups (mapconcat 'identity newsgroups ",") + newsgroups (vm-parse newsgroups "[ \t\f\r\n,]*\\([^ \t\f\r\n,]+\\)") + newsgroups (vm-delete-duplicates newsgroups) + newsgroups (if newsgroups (mapconcat 'identity newsgroups ","))) + (vm-mail-internal + (if to + (format "reply to %s%s" + (rfc822/full-name-string + (car (rfc822/parse-address + (rfc822/lexical-analyze to)))) + (if cc ", ..." ""))) + to subject in-reply-to cc references newsgroups) + (setq mail-reply-buffer buf + ;; vm-system-state 'replying + default-directory dir)) + (if include-text + (save-excursion + (goto-char (point-min)) + (let ((case-fold-search nil)) + (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "$") nil 0)) + (forward-char 1) + (tm-vm/yank-content))) + (run-hooks 'vm-reply-hook) + (run-hooks 'vm-mail-mode-hook) + )) + +(defun tm-vm/following-method (buf) + (tm-vm/do-reply buf 'to-all 'include-text) + ) + +(defun tm-vm/yank-content () + (interactive) + (let ((this-command 'vm-yank-message)) + (vm-display nil nil '(vm-yank-message) + '(vm-yank-message composing-message)) + (save-restriction + (narrow-to-region (point)(point)) + (insert-buffer mail-reply-buffer) + (goto-char (point-max)) + (push-mark) + (goto-char (point-min))) + (cond (mail-citation-hook (run-hooks 'mail-citation-hook)) + (mail-yank-hooks (run-hooks 'mail-yank-hooks)) + (t (mail-indent-citation))) + )) + +(set-alist 'mime-viewer/following-method-alist + 'vm-mode + (function tm-vm/following-method)) +(set-alist 'mime-viewer/following-method-alist + 'vm-virtual-mode + (function tm-vm/following-method)) + + (defun tm-vm/quit-view-message () "Quit MIME-viewer and go back to VM. This function is called by `mime-viewer/quit' command via @@ -651,7 +878,7 @@ created to send a digest in multipart/digest type format. If `vm-digest-send-type' is \"rfc1521\", tm-vm runs this hook instead of `vm-send-digest-hook'.") -(defun tm-vm/enclose-messages (mlist) +(defun tm-vm/enclose-messages (mlist &optional preamble) "Enclose the messages in MLIST as multipart/digest. The resulting digest is inserted at point in the current buffer. @@ -659,6 +886,7 @@ MLIST should be a list of message structs (real or virtual). These are the messages that will be enclosed." (if mlist (let ((digest (consp (cdr mlist))) + (mp mlist) m) (save-restriction (narrow-to-region (point) (point)) @@ -668,6 +896,21 @@ These are the messages that will be enclosed." (tm-mail/insert-message m) (goto-char (point-max)) (setq mlist (cdr mlist))) + (if preamble + (progn + (goto-char (point-min)) + (mime-editor/insert-tag "text" "plain") + (vm-unsaved-message "Building digest preamble...") + (while mp + (let ((vm-summary-uninteresting-senders nil)) + (insert + (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n")) + (if vm-digest-center-preamble + (progn + (forward-char -1) + (center-line) + (forward-char 1))) + (setq mp (cdr mp))))) (if digest (mime-editor/enclose-digest-region (point-min) (point-max))) )))) @@ -712,7 +955,7 @@ Subject: header manually." (run-hooks 'tm-vm/forward-message-hook) (run-hooks 'vm-mail-mode-hook))))) -(defun tm-vm/send-digest (&optional prefix) +(defun tm-vm/send-digest (&optional arg) "Send a digest of all messages in the current folder to recipients. The type of the digest is specified by the variable vm-digest-send-type. You will be placed in a Mail mode buffer as is usual with replies, but you @@ -722,45 +965,26 @@ If invoked on marked messages (via vm-next-command-uses-marks), only marked messages will be put into the digest." (interactive "P") (if (not (equal vm-digest-send-type "rfc1521")) - (vm-send-digest prefix) + (vm-send-digest arg) (vm-select-folder-buffer) (vm-check-for-killed-summary) (vm-error-if-folder-empty) (let ((dir default-directory) - (mp vm-message-pointer) - (mlist (if (eq last-command 'vm-next-command-uses-marks) - (vm-select-marked-or-prefixed-messages 0) - vm-message-list)) + (vm-forward-list (if (eq last-command 'vm-next-command-uses-marks) + (vm-select-marked-or-prefixed-messages 0) + vm-message-list)) start) (save-restriction (widen) (vm-mail-internal (format "digest from %s" (buffer-name))) (setq vm-system-state 'forwarding - vm-forward-list mlist default-directory dir) (goto-char (point-min)) (re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n")) (goto-char (match-end 0)) - (setq start (point) - mp mlist) (vm-unsaved-message "Building %s digest..." vm-digest-send-type) - (tm-vm/enclose-messages mlist) - (goto-char start) - (setq mp mlist) - (if prefix - (progn - (mime-editor/insert-tag "text" "plain") - (vm-unsaved-message "Building digest preamble...") - (while mp - (let ((vm-summary-uninteresting-senders nil)) - (insert (vm-sprintf 'vm-digest-preamble-format (car mp)) "\n")) - (if vm-digest-center-preamble - (progn - (forward-char -1) - (center-line) - (forward-char 1))) - (setq mp (cdr mp))))) + (tm-vm/enclose-messages vm-forward-list arg) (mail-position-on-field "To") (message "Building %s digest... done" vm-digest-send-type))) (run-hooks 'tm-vm/send-digest-hook) @@ -770,9 +994,6 @@ only marked messages will be put into the digest." 'tm-vm/forward-message vm-mode-map) (substitute-key-definition 'vm-send-digest 'tm-vm/send-digest vm-mode-map) - -;;; @@ for message/rfc822 -;;; ;;; @@ setting @@ -800,6 +1021,12 @@ only marked messages will be put into the digest." (autoload 'tm-mail/insert-message "tm-mail") (set-alist 'mime-editor/message-inserter-alist 'mail-mode (function tm-mail/insert-message)) + (set-alist 'mime-editor/split-message-sender-alist + 'mail-mode (function + (lambda () + (interactive) + (sendmail-send-it) + ))) (if (and (string-match "XEmacs\\|Lucid" emacs-version) tm-vm/use-xemacs-popup-menu) (add-hook 'vm-mail-mode-hook 'mime-editor/attach-to-vm-mode-menu)