tm 7.41.3.
[elisp/tm.git] / mh-e / tm-mh-e.el
index c059ea3..aec9216 100644 (file)
@@ -5,13 +5,30 @@
 ;;; Copyright (C) 1993,1994,1995 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;; 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.47 $
 ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
-
-;;; @ require modules
+;;; 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 'tl-str)
 (require 'tl-misc)
   )
 (require 'tm-view)
 
+(or (fboundp 'mh-get-header-field)
+    (defalias 'mh-get-header-field 'mh-get-field)
+    )
+
 
 ;;; @ version
 ;;;
 
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 7.9 1995/10/26 09:26:23 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))
 
 ;;; @ variable
 ;;;
 
-(defvar tm-mh-e/decode-all t
-  "*If t, decode all of the message. Otherwise decode header only.")
+(defvar tm-mh-e/automatic-mime-preview t
+  "*If non-nil, show MIME processed message.")
+
+(defvar tm-mh-e/decode-encoded-word t
+  "*If non-nil, decode encoded-word when it is not MIME preview mode.")
 
-(defvar tm-mh-e/decode-encoded-word t)
+(defvar tm-mh-e/forwcomps "forwcomps"
+  "Name of file to be used as a skeleton for forwarding messages.
+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.")
 
 
 ;;; @ functions
@@ -50,7 +78,7 @@
 
 (defun mh-display-msg (msg-num folder &optional show-buffer mode)
   (or mode
-      (setq mode tm-mh-e/decode-all)
+      (setq mode tm-mh-e/automatic-mime-preview)
       )
   ;; Display message NUMBER of FOLDER.
   ;; Sets the current buffer to the show buffer.
                   )
                 (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
 (defun tm-mh-e/view-message (&optional msg)
   "MIME decode and play this message."
   (interactive)
-  (if (null tm-mh-e/decode-all)
-      (let ((tm-mh-e/decode-all t))
+  (if (or (null tm-mh-e/automatic-mime-preview)
+         (null (get-buffer mh-show-buffer))
+         (save-excursion
+           (set-buffer mh-show-buffer)
+           (not (eq major-mode 'mime/viewer-mode))
+           ))
+      (let ((tm-mh-e/automatic-mime-preview t))
        (mh-invalidate-show-buffer)
        (mh-show-msg msg)
        ))
   "Toggle MIME processing mode.
 With arg, turn MIME processing on if arg is positive."
   (interactive "P")
-  (setq tm-mh-e/decode-all
+  (setq tm-mh-e/automatic-mime-preview
        (if (null arg)
-           (not tm-mh-e/decode-all)
+           (not tm-mh-e/automatic-mime-preview)
          arg))
   (save-excursion
     (set-buffer mh-show-buffer)
-    (if (null tm-mh-e/decode-all)
+    (if (null tm-mh-e/automatic-mime-preview)
        (if (and mime::preview/article-buffer
                 (get-buffer mime::preview/article-buffer))
            (kill-buffer mime::preview/article-buffer)
@@ -176,7 +210,7 @@ With arg, turn MIME processing on if arg is positive."
 (defun tm-mh-e/header-display ()
   (interactive)
   (mh-invalidate-show-buffer)
-  (let (mime-viewer/ignored-field-list
+  (let ((mime-viewer/ignored-field-regexp "^:$")
        tm-mh-e/decode-encoded-word)
     (mh-header-display)
     ))
@@ -184,7 +218,7 @@ With arg, turn MIME processing on if arg is positive."
 (defun tm-mh-e/raw-display ()
   (interactive)
   (mh-invalidate-show-buffer)
-  (let (tm-mh-e/decode-all
+  (let (tm-mh-e/automatic-mime-preview
        tm-mh-e/decode-encoded-word)
     (mh-header-display)
     ))
@@ -198,16 +232,7 @@ With arg, turn MIME processing on if arg is positive."
 
 (defun tm-mh-e/content-header-filter ()
   (goto-char (point-min))
-  (while (and (re-search-forward mime-viewer/ignored-field-regexp nil t)
-             (progn
-               (delete-region
-                (match-beginning 0)
-                (save-excursion
-                  (and
-                   (re-search-forward "^\\([^ \t]\\|$\\)" nil t)
-                   (match-beginning 0)
-                   )))
-               t)))
+  (mime-preview/cut-header)
   (tm-mh-e/code-convert-region-to-emacs (point-min)(point-max)
                                        mime/default-coding-system)
   (mime/decode-message-header)
@@ -228,12 +253,21 @@ With arg, turn MIME processing on if arg is positive."
      (let ((name (buffer-name buf)))
        (substring name 5)
        ))
-    (if (not tm-mh-e/decode-all)
+    (if (not tm-mh-e/automatic-mime-preview)
        (mh-invalidate-show-buffer)
       )
     (mh-show (mh-get-msg-num t))
     ))
 
+(defun tm-mh-e/set-window-configuration ()
+  (save-excursion
+    (set-buffer mh-show-buffer)
+    (setq mime::preview/original-window-configuration
+         (current-window-configuration))
+    ))
+
+(add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration)
+
 
 ;;; @ for tm-partial
 ;;;
@@ -257,7 +291,7 @@ With arg, turn MIME processing on if arg is positive."
               'mh-show-mode
               (function
                (lambda ()
-                 (let ((tm-mh-e/decode-all t))
+                 (let ((tm-mh-e/automatic-mime-preview t))
                    (tm-mh-e/show)
                    ))))
     )))
@@ -283,18 +317,38 @@ With arg, turn MIME processing on if arg is positive."
    (tm-mh-e::message/number message)
    (mh-expand-file-name (tm-mh-e::message/folder message))
    ))
-  
+
+;;; modified by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;;    1995/11/14 (cf. [tm-ja:1096])
 (defun tm-mh-e/prompt-for-message (prompt folder &optional default)
-  (let ((files
-        (directory-files (mh-expand-file-name folder) nil "^[0-9]+$")
-        )
-       (default mh-sent-from-msg)
-       )
-    (setq default
-         (if default
-             (int-to-string default)
-           (car files)
-           ))
+  (let* ((files
+         (directory-files (mh-expand-file-name folder) nil "^[0-9]+$")
+         )
+        (folder-buf (get-buffer folder))
+        (default
+          (if folder-buf
+              (save-excursion
+                (set-buffer folder-buf)
+                (let* ((show-buffer (get-buffer mh-show-buffer))
+                       (show-buffer-file-name
+                        (buffer-file-name show-buffer)))
+                  (if show-buffer-file-name
+                      (file-name-nondirectory show-buffer-file-name)))))))
+    (if (or (null default)
+           (not (string-match "^[0-9]+$" default)))
+       (setq default
+             (if (and (string= folder mh-sent-from-folder)
+                      mh-sent-from-msg)
+                 (int-to-string mh-sent-from-msg)
+               (save-excursion
+                 (let (cur-msg)
+                   (if (and
+                        (= 0 (mh-exec-cmd-quiet nil "pick" folder "cur"))
+                        (set-buffer mh-temp-buffer)
+                        (setq cur-msg (buffer-string))
+                        (string-match "^[0-9]+$" cur-msg))
+                       (substring cur-msg 0 (match-end 0))
+                     (car files)))))))
     (completing-read prompt
                     (let ((i 0))
                       (mapcar (function
@@ -306,27 +360,248 @@ With arg, turn MIME processing on if arg is positive."
                       ) nil nil default)
     ))
 
-(defun tm-mh-e/query-message ()
-  (let* ((folder (mh-prompt-for-folder "Visit" "+inbox" nil))
-        (number (tm-mh-e/prompt-for-message "Number: " folder))
-        )
+(defun tm-mh-e/query-message (&optional message)
+  (let (folder number)
+    (if message
+       (progn
+         (setq folder (tm-mh-e::message/folder message))
+         (setq number (tm-mh-e::message/number message))
+         ))
+    (or (stringp folder)
+       (setq folder (mh-prompt-for-folder
+                     "Message from"
+                     (if (and (stringp mh-sent-from-folder)
+                              (string-match "^\\+" mh-sent-from-folder))
+                         mh-sent-from-folder "+inbox")
+                     nil)))
+    (setq number
+         (if (numberp number)
+             (number-to-string number)
+           (tm-mh-e/prompt-for-message "Message number: " folder)
+           ))
     (tm-mh-e::make-message folder number)
     ))
+;;; end
+
+;;; by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;;    1995/11/14 (cf. [tm-ja:1099])
+(defun tm-mh-e/forward (to cc &optional msg-or-seq)
+  "Forward a message or message sequence as MIME message/rfc822.
+Defaults to displayed message. If optional prefix argument provided,
+then prompt for the message sequence. See also documentation for
+`\\[mh-send]' function."
+  (interactive (progn
+                (require 'mh-comp)
+                (list (mh-read-address "To: ")
+                      (mh-read-address "Cc: ")
+                      (if current-prefix-arg
+                          (mh-read-seq-default "Forward" t)
+                        (mh-get-msg-num t)
+                        ))))
+  (or msg-or-seq
+      (setq msg-or-seq (mh-get-msg-num t)))
+  (let* ((folder mh-current-folder)
+        (config (current-window-configuration))
+        ;; uses "draft" for compatibility with forw.
+        ;; forw always leaves file in "draft" since it doesn't have -draft
+        (draft-name (expand-file-name "draft" mh-user-path))
+        (draft (cond ((or (not (file-exists-p draft-name))
+                          (y-or-n-p "The file `draft' exists.  Discard it? "))
+                      (mh-exec-cmd "comp"
+                                   "-noedit" "-nowhatnowproc"
+                                   "-form" tm-mh-e/forwcomps
+                                   "-nodraftfolder")
+                      (prog1
+                          (mh-read-draft "" draft-name t)
+                        (mh-insert-fields "To:" to "Cc:" cc)
+                        (set-buffer-modified-p nil)))
+                     (t
+                      (mh-read-draft "" draft-name nil)))))
+    (require 'tm-edit)
+    (let ((msubtype "digest")
+         orig-from orig-subject multipart-flag
+         (tag-regexp
+          (concat "^"
+                  (regexp-quote (mime-make-tag "message" "rfc822"))))
+         )
+      (goto-char (point-min))
+      (save-excursion
+       (save-restriction
+         (goto-char (point-max))
+         (if (not (bolp)) (insert "\n"))
+         (let ((beg (point)))
+           (narrow-to-region beg beg)
+           (mh-exec-cmd-output "pick" nil folder msg-or-seq)
+           (if (> (count-lines (point) (point-max)) 1)
+               (setq multipart-flag t)
+             )
+           (while (re-search-forward "^\\([0-9]+\\)\n" nil t)
+             (let ((forw-msg
+                    (buffer-substring (match-beginning 1) (match-end 1)))
+                   (beg (match-beginning 0))
+                   (end (match-end 0))
+                   )
+               (save-restriction
+                 (narrow-to-region beg end)
+                 ;; modified for Emacs 18
+                 (delete-region beg end)
+                 (insert-file-contents
+                  (mh-expand-file-name forw-msg
+                                       (mh-expand-file-name folder))
+                  )
+                 (save-excursion
+                   (push-mark (point-max))
+                   (mime-editor/inserted-message-filter))
+                 (goto-char (point-max))
+                 )
+               (save-excursion
+                 (goto-char beg)
+                 (mime-editor/insert-tag "message" "rfc822")
+                 )))
+           (delete-region (point) (point-max))
+           (if multipart-flag
+               (mime-editor/enclose-region "digest" beg (point))
+             ))))
+      (re-search-forward tag-regexp)
+      (forward-line 1)
+      (save-restriction
+       (narrow-to-region (point) (point-max))
+       (setq orig-from (mh-get-header-field "From:"))
+       (setq orig-subject (mh-get-header-field "Subject:")))
+      (let ((forw-subject
+            (mh-forwarded-letter-subject orig-from orig-subject)))
+       (mh-insert-fields "Subject:" forw-subject)
+       (goto-char (point-min))
+       (re-search-forward tag-regexp)
+       (forward-line -1)
+       (delete-other-windows)
+       (if (numberp msg-or-seq)
+           (mh-add-msgs-to-seq msg-or-seq 'forwarded t)
+         (mh-add-msgs-to-seq (mh-seq-to-msgs msg-or-seq) 'forwarded t))
+       (mh-compose-and-send-mail draft "" folder msg-or-seq
+                                 to forw-subject cc
+                                 mh-note-forw "Forwarded:"
+                                 config)))))
+;;; end
 
 (defun tm-mh-e/insert-message (&optional message)
-  (if (null message)
-      (setq message (tm-mh-e/query-message))
-    )
-  (insert-file (tm-mh-e::message/file-name message))
-  )
+  ;; always ignores message
+  (let ((article-buffer
+        (if (not (and (stringp mh-sent-from-folder)
+                      (numberp mh-sent-from-msg)
+                      ))
+            (cond ((and (boundp 'gnus-original-article-buffer)
+                        (bufferp mh-sent-from-folder)
+                        (get-buffer gnus-original-article-buffer)
+                        )
+                   gnus-original-article-buffer)
+                  ((and (boundp 'gnus-article-buffer)
+                        (get-buffer gnus-article-buffer)
+                        (bufferp mh-sent-from-folder)
+                        )
+                   (save-excursion
+                     (set-buffer gnus-article-buffer)
+                     (if (eq major-mode 'mime/viewer-mode)
+                         mime::preview/article-buffer
+                       (current-buffer)
+                       )))
+                  ))))
+    (if (null article-buffer)
+       (tm-mh-e/insert-mail
+        (tm-mh-e::make-message mh-sent-from-folder mh-sent-from-msg)
+        )
+      (insert-buffer article-buffer)
+      (mime-editor/inserted-message-filter)
+      )
+    ))
+
+(defun tm-mh-e/insert-mail (&optional message)
+  (save-excursion
+    (save-restriction
+      (let ((message-file
+            (tm-mh-e::message/file-name (tm-mh-e/query-message message))))
+       (narrow-to-region (point) (point))
+       (insert-file-contents message-file)
+       (push-mark (point-max))
+       (mime-editor/inserted-message-filter)
+    ))))
 
 (call-after-loaded
  'tm-edit
  (function
   (lambda ()
     (set-alist
-     'tm-edit/message-inserter-alist
+     'mime-editor/message-inserter-alist
      'mh-letter-mode (function tm-mh-e/insert-message))
+    (set-alist
+     'mime-editor/mail-inserter-alist
+     '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))
+    )))
+
+(defun tm-mh-e/insert-letter (verbatim)
+  "Interface to mh-insert-letter."
+  (interactive "P")
+  (let*
+      ((folder (mh-prompt-for-folder
+               "Message from"
+               (if (and (stringp mh-sent-from-folder)
+                        (string-match "^\\+" mh-sent-from-folder))
+                   mh-sent-from-folder "+inbox")
+               nil))
+       (number (tm-mh-e/prompt-for-message "Message number: " folder)))
+    (mh-insert-letter folder number verbatim)))
+
+(defun tm-mh-e/yank-cur-msg ()
+  "Interface to mh-yank-cur-msg."
+  (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)))
+
+(call-after-loaded
+ 'mime-setup
+ (function
+  (lambda ()
+    (substitute-key-definition
+     'mh-forward 'tm-mh-e/forward mh-folder-mode-map)
+    (call-after-loaded
+     'mh-comp
+     (function
+      (lambda ()
+       (substitute-key-definition
+        'mh-yank-cur-msg 'tm-mh-e/yank-cur-msg mh-letter-mode-map)
+       )))
+    )))
+
+
+;;; @ for BBDB
+;;;
+
+(call-after-loaded
+ 'bbdb
+ (function
+  (lambda ()
+    (require 'tm-bbdb)
     )))
 
 
@@ -386,3 +661,5 @@ With arg, turn MIME processing on if arg is positive."
 (provide 'tm-mh-e)
 
 (run-hooks 'tm-mh-e-load-hook)
+
+;;; tm-mh-e.el ends here