-;;; mh-comp.el --- mh-e functions for composing messages
+;;; mh-comp.el --- MH-E functions for composing messages
;; Copyright (C) 1993,1995,1997,2000,2001,2002 Free Software Foundation, Inc.
;;; Commentary:
-;; Internal support for mh-e package.
+;; Internal support for MH-E package.
;;; Change Log:
-;; $Id: mh-comp.el,v 1.56 2002/04/07 19:20:56 wohler Exp $
+;; $Id: mh-comp.el,v 1.145 2002/11/29 16:49:43 wohler Exp $
;;; Code:
-(provide 'mh-comp)
(require 'mh-e)
(require 'mh-utils)
(require 'gnus-util)
(require 'easymenu)
+(require 'cl)
+
+;; Shush the byte-compiler
+(defvar adaptive-fill-first-line-regexp)
+(defvar font-lock-defaults)
+(defvar mark-active)
+(defvar sendmail-coding-system)
+(defvar tool-bar-mode)
;;; autoloads from mh-mime
+(autoload 'mh-press-button "mh-mime")
+
+;;; autoloads for mh-seq
+(autoload 'mh-notate-seq "mh-seq")
+
+(autoload 'mh-compose-insertion "mh-mime"
+ "Add a MIME directive to insert a file, using mhn or gnus.
+If the variable mh-compose-insertion is set to 'mhn, then that will be used.
+If it is set to 'gnus, then that will be used instead.")
+
+(autoload 'mh-compose-forward "mh-mime"
+ "Add a MIME directive to forward a message, using mhn or gnus.
+If the variable mh-compose-insertion is set to 'mhn, then that will be used.
+If it is set to 'gnus, then that will be used instead.")
(autoload 'mh-mhn-compose-insertion "mh-mime"
"Add a directive to insert a MIME message part from a file.
"Undoes the effect of \\[mh-edit-mhn] by reverting to the backup file.
Optional non-nil argument means don't ask for confirmation." t)
+(autoload 'mh-mml-to-mime "mh-mime"
+ "Compose MIME message from mml directives.")
+
+(autoload 'mh-mml-forward-message "mh-mime"
+ "Forward a message as attachment.
+The function will prompt the user for a description, a folder and message
+number.")
+
+(autoload 'mh-mml-attach-file "mh-mime"
+ "Attach a file to the outgoing MIME message.
+The file is not inserted or encoded until you send the message with
+`\\[message-send-and-exit]' or `\\[message-send]'.
+
+Message dispostion is \"inline\" is INLINE is non-nil, else the default is
+\"attachment\".
+FILE is the name of the file to attach. TYPE is its content-type, a
+string of the form \"type/subtype\". DESCRIPTION is a one-line
+description of the attachment.")
+
+(autoload 'mh-mml-secure-message-sign-pgpmime "mh-mime"
+ "Add MML tag to encrypt/sign the entire message.")
+
+(autoload 'mh-mml-secure-message-encrypt-pgpmime "mh-mime"
+ "Add MML tag to encrypt and sign the entire message.
+If called with a prefix argument, only encrypt (do NOT sign).")
+
;;; Other Autoloads.
(autoload 'Info-goto-node "info")
(autoload 'mail-mode-fill-paragraph "sendmail")
+(autoload 'mm-handle-displayed-p "mm-decode")
+
+(autoload 'sc-cite-original "sc"
+ "Workhorse citing function which performs the initial citation.
+This is callable from the various mail and news readers' reply
+function according to the agreed upon standard. See `\\[sc-describe]'
+for more details. `sc-cite-original' does not do any yanking of the
+original message but it does require a few things:
+
+ 1) The reply buffer is the current buffer.
+
+ 2) The original message has been yanked and inserted into the
+ reply buffer.
+
+ 3) Verbose mail headers from the original message have been
+ inserted into the reply buffer directly before the text of the
+ original message.
+
+ 4) Point is at the beginning of the verbose headers.
+
+ 5) Mark is at the end of the body of text to be cited.
+
+For Emacs 19's, the region need not be active (and typically isn't
+when this function is called. Also, the hook `sc-pre-hook' is run
+before, and `sc-post-hook' is run after the guts of this function.")
;;; Site customization (see also mh-utils.el):
(defgroup mh-compose nil
- "Mh-e functions for composing messages."
+ "MH-E functions for composing messages."
:prefix "mh-"
:group 'mh)
-
(defvar mh-send-prog "send"
"Name of the MH send program.
Some sites need to change this because of a name conflict.")
(defvar mh-redist-background nil
"If non-nil redist will be done in background like send.
-This allows transaction log to be visible if -watch, -verbose or -snoop are used.")
+This allows transaction log to be visible if -watch, -verbose or -snoop are
+used.")
(defvar mh-note-repl "-"
"String whose first character is used to notate replied to messages.")
with `mh-ins-buf-prefix' prefixed to each line.
See also the variable `mh-yank-from-start-of-msg', which controls how
-much of the message passed to the hook.")
+much of the message passed to the hook.
+
+This hook was historically provided to set up supercite. You may now leave
+this nil and set up supercite by setting the variable
+`mh-yank-from-start-of-msg' to 'supercite or, for more automatic insertion,
+to 'autosupercite.")
;;; Personal preferences:
-(defcustom mh-insert-x-mailer-p t
- "*If t, append an X-Mailer field to the header."
+(defcustom mh-compose-insertion (if (locate-library "mml") 'gnus 'mhn)
+ "Use either 'gnus or 'mhn to insert MIME message directives in messages."
+ :type '(choice (const :tag "Use gnus" gnus)
+ (const :tag "Use mhn" mhn))
+ :group 'mh-compose)
+
+(defcustom mh-x-face-file "~/.face"
+ "*File name containing the encoded X-Face string to insert in outgoing mail.
+If nil, or the file does not exist, nothing is added to message headers."
+ :type 'file
+ :group 'mh-compose)
+
+(defcustom mh-insert-x-mailer-flag t
+ "*Non-nil means append an X-Mailer field to the header."
:type 'boolean
:group 'mh-compose)
(defvar mh-x-mailer-string nil
"*String containing the contents of the X-Mailer header field.
-If nil, this variable is initialized to show the version of mh-e, Emacs, and
+If nil, this variable is initialized to show the version of MH-E, Emacs, and
MH the first time a message is composed.")
-(defcustom mh-delete-yanked-msg-window nil
- "*Controls window display when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
+(defcustom mh-insert-mail-followup-to-flag t
+ "Non-nil means maybe append a Mail-Followup-To field to the header.
+The insertion is done if the To: or Cc: fields matches an entry in
+`mh-insert-mail-followup-to-list'."
+ :type 'boolean
+ :group 'mh-compose)
+
+(defcustom mh-insert-mail-followup-to-list nil
+ "Alist of addresses for which a Mail-Followup-To field is inserted.
+Each element has the form (REGEXP ADDRESS).
+When the REGEXP appears in the To or cc fields of a message, the corresponding
+ADDRESS is inserted in a Mail-Followup-To field.
+
+Here's a customization example:
+
+ regexp: mh-e-users@lists.s\\\\(ourceforge\\\\|f\\\\).net
+ address: mh-e-users@lists.sourceforge.net
+
+This corresponds to:
+
+ (setq mh-insert-mail-followup-to-list
+ '((\"mh-e-users@lists.s\\\\(ourceforge\\\\|f\\\\).net\"
+ \"mh-e-users@lists.sourceforge.net\")))
+
+While it might be tempting to add a descriptive name to the mailing list
+address, consider that this field will appear in other people's outgoing
+mail in their To: field. It might be best to keep it simple."
+ :type '(repeat (list (string :tag "regexp") (string :tag "address")))
+ :group 'mh-compose)
+
+(defcustom mh-delete-yanked-msg-window-flag nil
+ "*Non-nil means delete any window displaying the message.
+Controls window display when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
If non-nil, yanking the current message into a draft letter deletes any
windows displaying the message."
:type 'boolean
:group 'mh-compose)
-(defcustom mh-yank-from-start-of-msg t
+(defcustom mh-yank-from-start-of-msg 'attribution
"*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
-If non-nil, include the entire message. If the symbol `body', then yank the
-message minus the header. If nil, yank only the portion of the message
-following the point. If the show buffer has a region, this variable is
-ignored."
+If t, include the entire message, with full headers. This is historically
+here for use with supercite, but is now deprecated in favor of the setting
+`supercite' below.
+
+If the symbol `body', then yank the message minus the header.
+
+If the symbol `supercite', include the entire message, with full headers.
+This also causes the invocation of `sc-cite-original' without the setting
+of `mail-citation-hook', now deprecated practice.
+
+If the symbol `autosupercite', do as for `supercite' automatically when
+show buffer matches the message being replied-to. When this option is used,
+the -noformat switch is passed to the repl program to override a -filter or
+-format switch.
+
+If the symbol `attribution', then yank the message minus the header and add
+a simple attribution line at the top.
+
+If the symbol `autoattrib', do as for `attribution' automatically when show
+buffer matches the message being replied-to. You can make sure this is
+always the case by setting `mh-reply-show-message-flag' to t (which is the
+default) and optionally `mh-delete-yanked-msg-window-flag' to t as well such
+that the show window is never displayed. When the `autoattrib' option is
+used, the -noformat switch is passed to the repl program to override a
+-filter or -format switch.
+
+If nil, yank only the portion of the message following the point.
+
+If the show buffer has a region, this variable is ignored unless its value is
+one of `attribution' or `autoattrib' in which case the attribution is added
+to the yanked region."
:type '(choice (const :tag "Below point" nil)
(const :tag "Without header" body)
- (other :tag "Entire message" t))
+ (const :tag "Invoke supercite" supercite)
+ (const :tag "Invoke supercite, automatically" autosupercite)
+ (const :tag "Without header, with attribution" attribution)
+ (const :tag "Without header, with attribution, automatically"
+ autoattrib)
+ (const :tag "Entire message with headers" t))
+ :group 'mh-compose)
+
+(defcustom mh-extract-from-attribution-verb "wrote:"
+ "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]."
+ :type '(choice (const "wrote:")
+ (const "a écrit :")
+ (string :tag "Custom string"))
:group 'mh-compose)
(defcustom mh-ins-buf-prefix "> "
system MH lib directory.")
(defvar mh-repl-group-formfile "replgroupcomps"
- "Name of file to be used as a skeleton for replying to the sender and all recipients of a message.
-Only used if `mh-nmh-p' is non-nil. Default is \"replgroupcomps\". If not an
-absolute file name, the file is searched for first in the user's MH directory,
-then in the system MH lib directory.")
+ "Name of file to be used as a skeleton for replying to messages.
+This file is used to form replies to the sender and all recipients of a
+message. Only used if `mh-nmh-flag' is non-nil. Default is \"replgroupcomps\".
+If not an absolute file name, the file is searched for first in the user's MH
+directory, then in the system MH lib directory.")
-(defcustom mh-reply-show-message-p t
- "*Whether the show buffer is displayed using \\<mh-letter-mode-map>\\[mh-reply].
+(defcustom mh-reply-show-message-flag t
+ "*Non-nil means the show buffer is displayed using \\<mh-letter-mode-map>\\[mh-reply].
The setting of this variable determines whether the MH `show-buffer' is
displayed with the current message when using `mh-reply' without a prefix
(defcustom mh-letter-fill-column 72
"*Fill column to use in `mh-letter-mode'.
This is usually less than in other text modes because email messages get
-quoted by some prefix (sometimes many times) when they are replied-to,
+quoted by some prefix (sometimes many times) when they are replied to,
and it's best to avoid quoted lines that span more than 80 columns."
:type 'integer
:group 'mh-compose)
:type 'hook
:group 'mh-compose)
+(defcustom mh-letter-insert-signature-hook nil
+ "Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-insert-signature] command.
+Can be used to determine which signature file to use based on message content.
+On return, if `mh-signature-file-name' is non-nil that file will be inserted at
+the current point in the buffer."
+ :type 'hook
+ :group 'mh-compose)
+
(defvar mh-rejected-letter-start
- (regexp-opt
- '("^Content-Type: message/rfc822$" ;MIME MDN
- "^ ----- Unsent message follows -----$" ;from sendmail V5
- "^ ----- Original message follows -----$" ;from sendmail V8
- "^------- Unsent Draft$" ;from MH itself
- "^---------- Original Message ----------$" ;from zmailer
- "^ --- The unsent message follows ---$" ;from AIX mail system
- "^ Your message follows:$" ;from MMDF-II
- "^Content-Description: Returned Content$" ;1993 KJ sendmail
- )))
+ (format "^%s$"
+ (regexp-opt
+ '("Content-Type: message/rfc822" ;MIME MDN
+ " ----- Unsent message follows -----" ;from sendmail V5
+ " --------Unsent Message below:" ; from sendmail at BU
+ " ----- Original message follows -----" ;from sendmail V8
+ "------- Unsent Draft" ;from MH itself
+ "---------- Original Message ----------" ;from zmailer
+ " --- The unsent message follows ---" ;from AIX mail system
+ " Your message follows:" ;from MMDF-II
+ "Content-Description: Returned Content" ;1993 KJ sendmail
+ ))))
(defvar mh-new-draft-cleaned-headers
"^Date:\\|^Received:\\|^Message-Id:\\|^From:\\|^Sender:\\|^Errors-To:\\|^Delivery-Date:\\|^Return-Path:"
"Keymap for composing mail.")
(defvar mh-letter-mode-syntax-table nil
- "Syntax table used by mh-e while in MH-Letter mode.")
+ "Syntax table used by MH-E while in MH-Letter mode.")
(if mh-letter-mode-syntax-table
()
(make-syntax-table text-mode-syntax-table))
(modify-syntax-entry ?% "." mh-letter-mode-syntax-table))
+(defvar mh-sent-from-folder nil
+ "Folder of msg assoc with this letter.")
+
+(defvar mh-sent-from-msg nil
+ "Number of msg assoc with this letter.")
+
+(defvar mh-send-args nil
+ "Extra args to pass to \"send\" command.")
+
+(defvar mh-annotate-char nil
+ "Character to use to annotate `mh-sent-from-msg'.")
+
+(defvar mh-annotate-field nil
+ "Field name for message annotation.")
;;;###autoload
(defun mh-smail ()
"Compose and send mail with the MH mail system.
-This function is an entry point to mh-e, the Emacs front end
+This function is an entry point to MH-E, the Emacs front end
to the MH mail system.
See documentation of `\\[mh-send]' for more details on composing mail."
(mh-find-path)
(call-interactively 'mh-send))
-
(defvar mh-error-if-no-draft nil) ;raise error over using old draft
-
;;;###autoload
(defun mh-smail-batch (&optional to subject other-headers &rest ignored)
"Set up a mail composition draft with the MH mail system.
-This function is an entry point to mh-e, the Emacs front end
+This function is an entry point to MH-E, the Emacs front end
to the MH mail system. This function does not prompt the user
for any header fields, and thus is suitable for use by programs
that want to create a mail buffer.
Users should use `\\[mh-smail]' to compose mail.
Optional arguments for setting certain fields include TO, SUBJECT, and
-OTHER-HEADERS."
+OTHER-HEADERS. Additional arguments are IGNORED."
(mh-find-path)
(let ((mh-error-if-no-draft t))
(mh-send (or to "") "" (or subject ""))))
switch-function yank-action
send-actions)
"Set up mail composition draft with the MH mail system.
-This is `mail-user-agent' entry point to mh-e.
+This is `mail-user-agent' entry point to MH-E.
The optional arguments TO and SUBJECT specify recipients and the
initial Subject field, respectively.
(cond ((and mh-draft-folder (equal from-folder mh-draft-folder))
(pop-to-buffer (find-file-noselect (mh-msg-filename msg)) t)
(rename-buffer (format "draft-%d" msg))
+ ;; Make buffer writable...
+ (setq buffer-read-only nil)
+ ;; If buffer was being used to display the message reinsert
+ ;; from file...
+ (when (eq major-mode 'mh-show-mode)
+ (erase-buffer)
+ (insert-file-contents buffer-file-name))
(buffer-name))
(t
(mh-read-draft "clean-up" (mh-msg-filename msg) nil)))))
(goto-char (point-min))
(save-buffer)
(mh-compose-and-send-mail draft "" from-folder nil nil nil nil nil nil
- config)))
-
+ config)
+ (mh-letter-mode-message)))
(defun mh-extract-rejected-mail (msg)
"Extract message MSG returned by the mail system and make it resendable.
(mh-get-header-field "To:")
(mh-get-header-field "From:")
(mh-get-header-field "Cc:")
- nil nil config)))
-
+ nil nil config)
+ (mh-letter-mode-message)))
(defun mh-forward (to cc &optional msg-or-seq)
- "Forward displayed message to recipients TO and CC.
-If optional prefix argument MSG-OR-SEQ provided, then prompt for the message
-sequence. See also documentation for `\\[mh-send]' function."
+"Forward one or more messages to the recipients TO and CC.
+
+Use the optional MSG-OR-SEQ to specify a message or sequence to forward.
+
+Default is the displayed message. If optional prefix argument is given then
+prompt for the message sequence. If variable `transient-mark-mode' is non-nil
+and the mark is active, then the selected region is forwarded.
+See also documentation for `\\[mh-send]' function."
(interactive (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)))
+ (cond
+ ((mh-mark-active-p t)
+ (mh-region-to-sequence (region-beginning) (region-end))
+ 'region)
+ (current-prefix-arg
+ (mh-read-seq-default "Forward" t))
+ (t
+ (mh-get-msg-num t)))))
(let* ((folder mh-current-folder)
+ (msgs (if (numberp msg-or-seq)
+ (list msg-or-seq)
+ (mh-seq-to-msgs msg-or-seq)))
(config (current-window-configuration))
- (fwd-msg-file (mh-msg-filename (if (numberp msg-or-seq)
- msg-or-seq
- (car (mh-seq-to-msgs msg-or-seq)))
- folder))
+ (fwd-msg-file (mh-msg-filename (car msgs) folder))
;; 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 "forw" "-build"
- mh-current-folder msg-or-seq)
+ (mh-exec-cmd "forw" "-build" (if mh-nmh-flag "-mime")
+ mh-current-folder msgs)
(prog1
(mh-read-draft "" draft-name t)
(mh-insert-fields "To:" to "Cc:" cc)
(setq orig-subject (mh-get-header-field "Subject:")))
(let ((forw-subject
(mh-forwarded-letter-subject orig-from orig-subject))
- (mail-header-separator mh-mail-header-separator))
+ (mail-header-separator mh-mail-header-separator)
+ (compose))
(mh-insert-fields "Subject:" forw-subject)
(goto-char (point-min))
+ ;; If using MML, translate mhn
+ (if (equal mh-compose-insertion 'gnus)
+ (save-excursion
+ (setq compose t)
+ (re-search-forward (format "^\\(%s\\)?$" mail-header-separator))
+ (while
+ (re-search-forward "^#forw \\[\\([^]]+\\)\\] \\(+\\S-+\\) \\(.*\\)$" (point-max) t)
+ (let ((description (if (equal (match-string 1) "forwarded messages")
+ "forwarded message %d"
+ (match-string 1)))
+ (msgs (split-string (match-string 3)))
+ (i 0))
+ (beginning-of-line)
+ (delete-region (point)(progn (forward-line 1)(point)))
+ (dolist (msg msgs)
+ (setq i (1+ i))
+ (mh-mml-forward-message (format description i) folder msg))))))
+ ;; Postition just before forwarded message
(if (re-search-forward "^------- Forwarded Message" nil t)
(forward-line -1)
- (re-search-forward mail-header-separator)
+ (re-search-forward (format "^\\(%s\\)?$" mail-header-separator))
(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-add-msgs-to-seq msgs 'forwarded t)
(mh-compose-and-send-mail draft "" folder msg-or-seq
to forw-subject cc
mh-note-forw "Forwarded:"
- config)))))
+ config)
+ (if compose
+ (setq mh-mml-compose-insert-flag t))
+ (mh-letter-mode-message)))))
(defun mh-forwarded-letter-subject (from subject)
- ;; Return a Subject suitable for a forwarded message.
- ;; Original message has headers FROM and SUBJECT.
+ "Return a Subject suitable for a forwarded message.
+Original message has headers FROM and SUBJECT."
(let ((addr-start (string-match "<" from))
(comment (string-match "(" from)))
(cond ((and addr-start (> addr-start 0))
(setq from (substring from (1+ comment) (1- (length from)))))))
(format mh-forward-subject-format from subject))
-
;;;###autoload
(defun mh-smail-other-window ()
"Compose and send mail in other window with the MH mail system.
-This function is an entry point to mh-e, the Emacs front end
+This function is an entry point to MH-E, the Emacs front end
to the MH mail system.
See documentation of `\\[mh-send]' for more details on composing mail."
(mh-find-path)
(call-interactively 'mh-send-other-window))
-
(defun mh-redistribute (to cc &optional msg)
"Redistribute displayed message to recipients TO and CC.
Use optional argument MSG to redistribute another message.
(kill-buffer draft)
(message "Redistributing...done"))))
-
-(defun mh-reply (message &optional includep)
+(defun mh-show-buffer-message-number (&optional buffer)
+ "Message number of displayed message in corresponding show buffer.
+Return nil if show buffer not displayed.
+If in `mh-letter-mode', don't display the message number being replied to,
+but rather the message number of the show buffer associated with our
+originating folder buffer.
+Optional argument BUFFER can be used to specify the buffer."
+ (save-excursion
+ (if buffer
+ (set-buffer buffer))
+ (cond ((eq major-mode 'mh-show-mode)
+ (let ((number-start (search "/" buffer-file-name :from-end t)))
+ (car (read-from-string (subseq buffer-file-name
+ (1+ number-start))))))
+ ((and (eq major-mode 'mh-folder-mode)
+ mh-show-buffer
+ (get-buffer mh-show-buffer))
+ (mh-show-buffer-message-number mh-show-buffer))
+ ((and (eq major-mode 'mh-letter-mode)
+ mh-sent-from-folder
+ (get-buffer mh-sent-from-folder))
+ (mh-show-buffer-message-number mh-sent-from-folder))
+ (t
+ nil))))
+
+(defun mh-reply (message &optional reply-to includep)
"Reply to MESSAGE (default: current message).
-If optional prefix argument INCLUDEP provided, then include the message
-in the reply using filter `mhl.reply' in your MH directory.
-Prompts for type of addresses to reply to:
+If the optional argument REPLY-TO is not given, prompts for type of addresses
+to reply to:
from sender only,
to sender and primary recipients,
cc/all sender and all recipients.
+If optional prefix argument INCLUDEP provided, then include the message
+in the reply using filter `mhl.reply' in your MH directory.
If the file named by `mh-repl-formfile' exists, it is used as a skeleton
for the reply. See also documentation for `\\[mh-send]' function."
- (interactive (list (mh-get-msg-num t) current-prefix-arg))
- (let ((minibuffer-help-form
- "from => Sender only\nto => Sender and primary recipients\ncc or all => Sender and all recipients"))
- (let* ((reply-to (or mh-reply-default-reply-to
- (completing-read "Reply to whom: "
- '(("from") ("to") ("cc") ("all"))
- nil
- t)))
- (folder mh-current-folder)
- (show-buffer mh-show-buffer)
- (config (current-window-configuration))
- (group-reply (or (equal reply-to "cc") (equal reply-to "all")))
- (form-file (cond ((and mh-nmh-p group-reply
- (stringp mh-repl-group-formfile))
- mh-repl-group-formfile)
- ((stringp mh-repl-formfile) mh-repl-formfile)
- (t nil))))
- (message "Composing a reply...")
- (mh-exec-cmd "repl" "-build" "-noquery" "-nodraftfolder"
- (if form-file
- (list "-form" form-file))
- mh-current-folder message
- (cond ((or (equal reply-to "from") (equal reply-to ""))
- '("-nocc" "all"))
- ((equal reply-to "to")
- '("-cc" "to"))
- (group-reply (if mh-nmh-p
- '("-group" "-nocc" "me")
- '("-cc" "all" "-nocc" "me"))))
- (if includep
- '("-filter" "mhl.reply")))
- (let ((draft (mh-read-draft "reply"
- (expand-file-name "reply" mh-user-path)
- t)))
- (delete-other-windows)
- (save-buffer)
-
- (let ((to (mh-get-header-field "To:"))
- (subject (mh-get-header-field "Subject:"))
- (cc (mh-get-header-field "Cc:")))
- (goto-char (point-min))
- (mh-goto-header-end 1)
- (or includep
- (not mh-reply-show-message-p)
- (mh-in-show-buffer (show-buffer)
- (mh-display-msg message folder)))
- (mh-add-msgs-to-seq message 'answered t)
- (message "Composing a reply...done")
- (mh-compose-and-send-mail draft "" folder message to subject cc
- mh-note-repl "Replied:" config))))))
-
+ (interactive (list
+ (mh-get-msg-num t)
+ (let ((minibuffer-help-form
+ "from => Sender only\nto => Sender and primary recipients\ncc or all => Sender and all recipients"))
+ (or mh-reply-default-reply-to
+ (completing-read "Reply to whom? (from, to, all) [from]: "
+ '(("from") ("to") ("cc") ("all"))
+ nil
+ t)))
+ current-prefix-arg))
+ (let* ((folder mh-current-folder)
+ (show-buffer mh-show-buffer)
+ (config (current-window-configuration))
+ (group-reply (or (equal reply-to "cc") (equal reply-to "all")))
+ (form-file (cond ((and mh-nmh-flag group-reply
+ (stringp mh-repl-group-formfile))
+ mh-repl-group-formfile)
+ ((stringp mh-repl-formfile) mh-repl-formfile)
+ (t nil))))
+ (message "Composing a reply...")
+ (mh-exec-cmd "repl" "-build" "-noquery" "-nodraftfolder"
+ (if form-file
+ (list "-form" form-file))
+ mh-current-folder message
+ (cond ((or (equal reply-to "from") (equal reply-to ""))
+ '("-nocc" "all"))
+ ((equal reply-to "to")
+ '("-cc" "to"))
+ (group-reply (if mh-nmh-flag
+ '("-group" "-nocc" "me")
+ '("-cc" "all" "-nocc" "me"))))
+ (cond ((or (eq mh-yank-from-start-of-msg 'autosupercite)
+ (eq mh-yank-from-start-of-msg 'autoattrib))
+ '("-noformat"))
+ (includep '("-filter" "mhl.reply"))
+ (t '())))
+ (let ((draft (mh-read-draft "reply"
+ (expand-file-name "reply" mh-user-path)
+ t)))
+ (delete-other-windows)
+ (save-buffer)
+
+ (let ((to (mh-get-header-field "To:"))
+ (subject (mh-get-header-field "Subject:"))
+ (cc (mh-get-header-field "Cc:")))
+ (goto-char (point-min))
+ (mh-goto-header-end 1)
+ (or includep
+ (not mh-reply-show-message-flag)
+ (mh-in-show-buffer (show-buffer)
+ (mh-display-msg message folder)))
+ (mh-add-msgs-to-seq message 'answered t)
+ (message "Composing a reply...done")
+ (mh-compose-and-send-mail draft "" folder message to subject cc
+ mh-note-repl "Replied:" config))
+ (when (and (or (eq 'autosupercite mh-yank-from-start-of-msg)
+ (eq 'autoattrib mh-yank-from-start-of-msg))
+ (eq (mh-show-buffer-message-number) mh-sent-from-msg))
+ (undo-boundary)
+ (mh-yank-cur-msg))
+ (mh-letter-mode-message))))
(defun mh-send (to cc subject)
"Compose and send a letter.
-Do not call this function from outside mh-e; use \\[mh-smail] instead.
+Do not call this function from outside MH-E; use \\[mh-smail] instead.
The file named by `mh-comp-formfile' will be used as the form.
The letter is composed in `mh-letter-mode'; see its documentation for more
(delete-other-windows)
(mh-send-sub to cc subject config)))
-
(defun mh-send-other-window (to cc subject)
"Compose and send a letter in another window.
-Do not call this function from outside mh-e; use \\[mh-smail-other-window]
+Do not call this function from outside MH-E; use \\[mh-smail-other-window]
instead.
The file named by `mh-comp-formfile' will be used as the form.
(let ((pop-up-windows t))
(mh-send-sub to cc subject (current-window-configuration))))
-
(defun mh-send-sub (to cc subject config)
- ;; Do the real work of composing and sending a letter.
- ;; Expects the TO, CC, and SUBJECT fields as arguments.
- ;; CONFIG is the window configuration before sending mail.
+ "Do the real work of composing and sending a letter.
+Expects the TO, CC, and SUBJECT fields as arguments.
+CONFIG is the window configuration before sending mail."
(let ((folder mh-current-folder)
(msg-num (mh-get-msg-num nil)))
(message "Composing a message...")
(setq components
(expand-file-name mh-comp-formfile
;; What is this mh-etc ?? -sm
- (and (boundp 'mh-etc) mh-etc))))
+ ;; This is dead code, so
+ ;; remove it.
+ ;(and (boundp 'mh-etc) mh-etc)
+ )))
components)
(t
(error (format "Can't find components file \"%s\""
nil)))
(mh-insert-fields "To:" to "Subject:" subject "Cc:" cc)
(goto-char (point-max))
- (message "Composing a message...done")
(mh-compose-and-send-mail draft "" folder msg-num
to subject cc
- nil nil config))))
-
+ nil nil config)
+ (mh-letter-mode-message))))
(defun mh-read-draft (use initial-contents delete-contents-file)
- ;; Read draft file into a draft buffer and make that buffer the current one.
- ;; USE is a message used for prompting about the intended use of the message.
- ;; INITIAL-CONTENTS is filename that is read into an empty buffer, or NIL
- ;; if buffer should not be modified. Delete the initial-contents file if
- ;; DELETE-CONTENTS-FILE flag is set.
- ;; Returns the draft folder's name.
- ;; If the draft folder facility is enabled in ~/.mh_profile, a new buffer is
- ;; used each time and saved in the draft folder. The draft file can then be
- ;; reused.
+ "Read draft file into a draft buffer and make that buffer the current one.
+USE is a message used for prompting about the intended use of the message.
+INITIAL-CONTENTS is filename that is read into an empty buffer, or nil
+if buffer should not be modified. Delete the initial-contents file if
+DELETE-CONTENTS-FILE flag is set.
+Returns the draft folder's name.
+If the draft folder facility is enabled in ~/.mh_profile, a new buffer is
+used each time and saved in the draft folder. The draft file can then be
+reused."
(cond (mh-draft-folder
(let ((orig-default-dir default-directory)
(draft-file-name (mh-new-draft-name)))
(save-buffer)) ; Do not reuse draft name
(buffer-name))
-
(defun mh-new-draft-name ()
- ;; Returns the pathname of folder for draft messages.
+ "Return the pathname of folder for draft messages."
(save-excursion
(mh-exec-cmd-quiet t "mhpath" mh-draft-folder "new")
(buffer-substring (point-min) (1- (point-max)))))
-
(defun mh-annotate-msg (msg buffer note &rest args)
- ;; Mark the MESSAGE in BUFFER listing with the character NOTE and annotate
- ;; the saved message with ARGS.
+ "Mark MSG in BUFFER with character NOTE and annotate message with ARGS."
(apply 'mh-exec-cmd "anno" buffer msg args)
(save-excursion
(cond ((get-buffer buffer) ; Buffer may be deleted
(mh-notate-seq msg note (1+ mh-cmd-note))
(mh-notate msg note (1+ mh-cmd-note)))))))
-
(defun mh-insert-fields (&rest name-values)
- ;; Insert the NAME-VALUE pairs in the current buffer.
- ;; If field NAME exists, append VALUE to it.
- ;; Do not insert any pairs whose value is the empty string.
+ "Insert the NAME-VALUES pairs in the current buffer.
+If the field exists, append the value to it.
+Do not insert any pairs whose value is the empty string."
(let ((case-fold-search t))
(while name-values
(let ((field-name (car name-values))
(insert field-name " " value "\n")))
(setq name-values (cdr (cdr name-values)))))))
-
-(defun mh-position-on-field (field &optional ignore)
- ;; Move to the end of the FIELD in the header.
- ;; Move to end of entire header if FIELD not found.
- ;; Returns non-nil iff FIELD was found.
- ;; The optional second arg is for pre-version 4 compatibility.
+(defun mh-position-on-field (field &optional ignored)
+ "Move to the end of the FIELD in the header.
+Move to end of entire header if FIELD not found.
+Returns non-nil iff FIELD was found.
+The optional second arg is for pre-version 4 compatibility and is IGNORED."
(cond ((mh-goto-header-field field)
(mh-header-field-end)
t)
((mh-goto-header-end 0)
nil)))
-
(defun mh-get-header-field (field)
- ;; Find and return the body of FIELD in the mail header.
- ;; Returns the empty string if the field is not in the header of the
- ;; current buffer.
+ "Find and return the body of FIELD in the mail header.
+Returns the empty string if the field is not in the header of the
+current buffer."
(if (mh-goto-header-field field)
(progn
(skip-chars-forward " \t") ;strip leading white space in body
(buffer-substring start (point))))
""))
-(fset 'mh-get-field 'mh-get-header-field) ;mh-e 4 compatibility
+(fset 'mh-get-field 'mh-get-header-field) ;MH-E 4 compatibility
(defun mh-goto-header-field (field)
- ;; Move to FIELD in the message header.
- ;; Move to the end of the FIELD name, which should end in a colon.
- ;; Returns T if found, NIL if not.
+ "Move to FIELD in the message header.
+Move to the end of the FIELD name, which should end in a colon.
+Returns t if found, nil if not."
(goto-char (point-min))
(let ((case-fold-search t)
(headers-end (save-excursion
(re-search-forward (format "^%s" field) headers-end t)))
(defun mh-goto-header-end (arg)
- ;; Find the end of the message header in the current buffer and position
- ;; the cursor at the ARG'th newline after the header.
+ "Move the cursor ARG lines after the header."
(if (re-search-forward "^-*$" nil nil)
(forward-line arg)))
(defun mh-read-address (prompt)
- ;; Read a To: or Cc: address, prompting in the minibuffer with PROMPT.
- ;; May someday do completion on aliases.
+ "Read a To: or Cc: address, prompting in the minibuffer with PROMPT.
+May someday do completion on aliases."
(read-string prompt))
\f
;;; Mode for composing and sending a draft message.
-(defvar mh-sent-from-folder nil) ;Folder of msg assoc with this letter.
-
-(defvar mh-sent-from-msg nil) ;Number of msg assoc with this letter.
-
-(defvar mh-send-args nil) ;Extra args to pass to "send" command.
+(put 'mh-letter-mode 'mode-class 'special)
-(defvar mh-annotate-char nil) ;Character to use to annotate mh-sent-from-msg.
+;;; Support for emacs21 toolbar using gnus/message.el icons (and code).
+(eval-when-compile (defvar tool-bar-map))
+(defvar mh-letter-tool-bar-map nil)
+(when (and (fboundp 'tool-bar-add-item)
+ tool-bar-mode)
+ (setq mh-letter-tool-bar-map
+ (let ((tool-bar-map (make-sparse-keymap)))
+ (tool-bar-add-item "mail_send" 'mh-send-letter 'mh-lettertoolbar-send
+ :help "Send this letter")
+ (tool-bar-add-item "attach" 'mh-compose-insertion
+ 'mh-lettertoolbar-compose
+ :help "Insert attachment")
+ (tool-bar-add-item "spell" 'ispell-message 'mh-lettertoolbar-ispell
+ :help "Check spelling")
+ (tool-bar-add-item-from-menu 'save-buffer "save")
+ (tool-bar-add-item-from-menu 'undo "undo")
+ (tool-bar-add-item-from-menu 'kill-region "cut")
+ (tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy")
+ (tool-bar-add-item "close" 'mh-fully-kill-draft 'mh-lettertoolbar-kill
+ :help "Kill this draft")
+ (tool-bar-add-item "preferences" (lambda ()
+ (interactive)
+ (customize-group "mh-compose"))
+ 'mh-lettertoolbar-customize
+ :help "MH-E composition preferences")
+ (tool-bar-add-item "help" (lambda ()
+ (interactive)
+ (Info-goto-node "(mh-e)Draft Editing"))
+ 'mh-lettertoolbar-help :help "Help")
+ tool-bar-map)))
-(defvar mh-annotate-field nil) ;Field name for message annotation.
+;;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
+(eval-when-compile (defvar mh-letter-menu nil))
+(cond
+ ((fboundp 'easy-menu-define)
+ (easy-menu-define
+ mh-letter-menu mh-letter-mode-map "Menu for MH-E letter mode."
+ '("Letter"
+ ["Send This Draft" mh-send-letter t]
+ ["Split Current Line" mh-open-line t]
+ ["Check Recipient" mh-check-whom t]
+ ["Yank Current Message" mh-yank-cur-msg t]
+ ["Insert a Message..." mh-insert-letter t]
+ ["Insert Signature" mh-insert-signature t]
+ ["GPG Sign message" mh-mml-secure-message-sign-pgpmime mh-gnus-pgp-support-flag]
+ ["GPG Encrypt message" mh-mml-secure-message-encrypt-pgpmime mh-gnus-pgp-support-flag]
+ ["Compose Insertion (MIME)..." mh-compose-insertion t]
+;; ["Compose Compressed tar (MIME)..." mh-mhn-compose-external-compressed-tar t]
+;; ["Compose Anon FTP (MIME)..." mh-mhn-compose-anon-ftp t]
+ ["Compose Forward (MIME)..." mh-compose-forward t]
+;; The next two will have to be merged. But I also need to make sure the user
+;; can't mix directives of both types.
+ ["Pull in All Compositions (mhn)" mh-edit-mhn mh-mhn-compose-insert-flag]
+ ["Pull in All Compositions (gnus)" mh-mml-to-mime mh-mml-compose-insert-flag]
+ ["Revert to Non-MIME Edit (mhn)" mh-revert-mhn-edit (equal mh-compose-insertion 'mhn)]
+ ["Kill This Draft" mh-fully-kill-draft t]))))
-(put 'mh-letter-mode 'mode-class 'special)
+;;; Help Messages
+;;; Group messages logically, more or less.
+(defvar mh-letter-mode-help-messages
+ '((nil
+ "Send letter: \\[mh-send-letter]"
+ "\t\tOpen line: \\[mh-open-line]\n"
+ "Kill letter: \\[mh-fully-kill-draft]"
+ "\t\tInsert:\n"
+ "Check recipients: \\[mh-check-whom]"
+ "\t\t Current message: \\[mh-yank-cur-msg]\n"
+ "Encrypt message: \\[mh-mml-secure-message-encrypt-pgpmime]"
+ "\t\t Attachment: \\[mh-compose-insertion]\n"
+ "Sign message: \\[mh-mml-secure-message-sign-pgpmime]"
+ "\t\t Message to forward: \\[mh-compose-forward]\n"
+ " "
+ "\t\t Signature: \\[mh-insert-signature]"))
+ "Key binding cheat sheet.
+
+This is an associative array which is used to show the most common commands.
+The key is a prefix char. The value is one or more strings which are
+concatenated together and displayed in the minibuffer if ? is pressed after
+the prefix character. The special key nil is used to display the
+non-prefixed commands.
+
+The substitutions described in `substitute-command-keys' are performed as
+well.")
+
+
+(defun mh-fill-paragraph-function (arg)
+ "Fill paragraph at or after point.
+Prefix ARG means justify as well. This function enables `fill-paragraph' to
+work better in MH-Letter mode."
+ (interactive "P")
+ (let ((fill-paragraph-function) (fill-prefix))
+ (if (mh-in-header-p)
+ (mail-mode-fill-paragraph arg)
+ (fill-paragraph arg))))
;;;###autoload
(define-derived-mode mh-letter-mode text-mode "MH-Letter"
- "Mode for composing letters in mh-e.\\<mh-letter-mode-map>
+ "Mode for composing letters in MH-E.\\<mh-letter-mode-map>
When you have finished composing, type \\[mh-send-letter] to send the message
using the MH mail handling system.
If MH MIME directives are added manually, you must first run \\[mh-edit-mhn]
-before sending the message. MIME directives that are added by mh-e commands
+before sending the message. MIME directives that are added by MH-E commands
such as \\[mh-mhn-compose-insertion] are processed automatically when the
message is sent.
(make-local-variable 'mh-sent-from-msg)
(make-local-variable 'mail-header-separator)
(setq mail-header-separator mh-mail-header-separator) ;override sendmail.el
+ (make-local-variable 'mh-help-messages)
+ (setq mh-help-messages mh-letter-mode-help-messages)
;; From sendmail.el for proper paragraph fill
;; sendmail.el also sets a normal-auto-fill-function (not done here)
(make-local-variable 'paragraph-separate)
(make-local-variable 'paragraph-start)
(make-local-variable 'fill-paragraph-function)
- (setq fill-paragraph-function 'mail-mode-fill-paragraph)
+ (setq fill-paragraph-function 'mh-fill-paragraph-function)
(make-local-variable 'adaptive-fill-regexp)
(setq adaptive-fill-regexp
(concat adaptive-fill-regexp
(set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map))
(make-local-variable 'font-lock-defaults)
(cond
- ((equal mh-highlight-citation-p 'font-lock)
+ ((or (equal mh-highlight-citation-p 'font-lock)
+ (equal mh-highlight-citation-p 'gnus))
+ ;; Let's use font-lock even if gnus is used in show-mode. The reason
+ ;; is that gnus uses static text properties which are not appropriate
+ ;; for a buffer that will be edited. So the choice here is either fontify
+ ;; the citations and header...
(setq font-lock-defaults '(mh-show-font-lock-keywords-with-cite t)))
- ((equal mh-highlight-citation-p 'gnus)
- (setq font-lock-defaults '(mh-show-font-lock-keywords t))
- (mh-gnus-article-highlight-citation))
(t
+ ;; ...or the header only
(setq font-lock-defaults '(mh-show-font-lock-keywords t))))
(easy-menu-add mh-letter-menu)
;; See if a "forw: -mime" message containing a MIME composition.
;; mode clears local vars, so can't do this in mh-forward.
(save-excursion
(goto-char (point-min))
- (when (and (re-search-forward mail-header-separator nil t)
+ (when (and (re-search-forward (format "^\\(%s\\)?$" mail-header-separator) nil t)
(= 0 (forward-line 1))
(looking-at "^#forw"))
- (require 'mh-mime) ;Need mh-mhn-compose-insert-p local var
- (setq mh-mhn-compose-insert-p t)))
+ (require 'mh-mime) ;Need mh-mhn-compose-insert-flag local var
+ (setq mh-mhn-compose-insert-flag t)))
(setq fill-column mh-letter-fill-column)
;; if text-mode-hook turned on auto-fill, tune it for messages
(when auto-fill-function
(make-local-variable 'auto-fill-function)
(setq auto-fill-function 'mh-auto-fill-for-letter)))
-
(defun mh-auto-fill-for-letter ()
- ;; Auto-fill in letters treats the header specially by inserting a tab
- ;; before continuation line.
+ "Perform auto-fill for message.
+Header is treated specially by inserting a tab before continuation lines."
(if (mh-in-header-p)
(let ((fill-prefix "\t"))
(do-auto-fill))
(do-auto-fill)))
-
(defun mh-insert-header-separator ()
- ;; Inserts `mh-mail-header-separator', if absent.
+ "Insert `mh-mail-header-separator', if absent."
(save-excursion
(goto-char (point-min))
(rfc822-goto-eoh)
(insert (format "%s \n" target))
(backward-char 1)))))
-
(defun mh-to-fcc (&optional folder)
"Insert an Fcc: FOLDER field in the current message.
Prompt for the field name with a completion list of the current folders."
(substring folder 1)
folder)))))
-
(defun mh-insert-signature ()
- "Insert the file named by `mh-signature-file-name' at point."
+ "Insert the file named by `mh-signature-file-name' at point.
+The value of `mh-letter-insert-signature-hook' is a list of functions to be
+called, with no arguments, before the signature is actually inserted."
(interactive)
- (insert-file-contents mh-signature-file-name)
+ (let ((mh-signature-file-name mh-signature-file-name))
+ (run-hooks 'mh-letter-insert-signature-hook)
+ (if mh-signature-file-name
+ (insert-file-contents mh-signature-file-name)))
(force-mode-line-update))
-
(defun mh-check-whom ()
"Verify recipients of the current letter, showing expansion of any aliases."
(interactive)
;;; Routines to compose and send a letter.
+(defun mh-insert-x-face ()
+ "Append X-Face field to header.
+If the field already exists, this function does nothing."
+ (when (and (file-exists-p mh-x-face-file)
+ (file-readable-p mh-x-face-file))
+ (save-excursion
+ (when (null (mh-position-on-field "X-Face"))
+ (insert "X-Face: ")
+ (goto-char (+ (point) (cadr (insert-file-contents mh-x-face-file))))
+ (if (not (looking-at "^"))
+ (insert "\n"))))))
+
(defun mh-insert-x-mailer ()
- ;; Appends an X-Mailer field to the header.
- ;; The versions of mh-e, Emacs, and MH are shown.
+ "Append an X-Mailer field to the header.
+The versions of MH-E, Emacs, and MH are shown."
;; Lazily initialize mh-x-mailer-string.
(when (null mh-x-mailer-string)
(save-window-excursion
(mh-version)
(set-buffer mh-temp-buffer)
- (if mh-nmh-p
+ (if mh-nmh-flag
(search-forward-regexp "^nmh-\\(\\S +\\)")
(search-forward-regexp "^MH \\(\\S +\\)" nil t))
(let ((x-mailer-mh (buffer-substring (match-beginning 1) (match-end 1))))
(setq mh-x-mailer-string
- (format "mh-e %s; %s %s; Emacs %d.%d"
- mh-version (if mh-nmh-p "nmh" "MH") x-mailer-mh
+ (format "MH-E %s; %s %s; %s %d.%d"
+ mh-version (if mh-nmh-flag "nmh" "MH") x-mailer-mh
+ (if mh-xemacs-flag
+ "XEmacs"
+ "Emacs")
emacs-major-version emacs-minor-version)))
(kill-buffer mh-temp-buffer)))
;; Insert X-Mailer, but only if it doesn't already exist.
(when (null (mh-goto-header-field "X-Mailer"))
(mh-insert-fields "X-Mailer:" mh-x-mailer-string))))
+(defun mh-regexp-in-field-p (regexp &rest fields)
+ "Non-nil means REGEXP was found in FIELDS."
+ (save-excursion
+ (let ((search-result nil)
+ (field))
+ (while fields
+ (setq field (car fields))
+ (if (and (mh-goto-header-field field)
+ (re-search-forward
+ regexp (save-excursion (mh-header-field-end)(point)) t))
+ (setq fields nil
+ search-result t)
+ (setq fields (cdr fields))))
+ search-result)))
+
+(defun mh-insert-mail-followup-to ()
+ "Insert Mail-Followup-To: if To or Cc match `mh-insert-mail-followup-to-list'."
+ (save-excursion
+ (if (and (or (mh-goto-header-field "To:")(mh-goto-header-field "cc:"))
+ (not (mh-goto-header-field "Mail-Followup-To: ")))
+ (let ((list mh-insert-mail-followup-to-list))
+ (while list
+ (let ((regexp (nth 0 (car list)))
+ (entry (nth 1 (car list))))
+ (when (mh-regexp-in-field-p regexp "To:" "cc:")
+ (if (mh-goto-header-field "Mail-Followup-To: ")
+ (insert entry ", ")
+ (mh-goto-header-end 0)
+ (insert "Mail-Followup-To: " entry "\n")))
+ (setq list (cdr list))))))))
(defun mh-compose-and-send-mail (draft send-args
sent-from-folder sent-from-msg
to subject cc
annotate-char annotate-field
config)
- ;; Edit and compose a draft message in buffer DRAFT and send or save it.
- ;; SENT-FROM-FOLDER is buffer containing scan listing of current folder, or
- ;; nil if none exists.
- ;; SENT-FROM-MSG is the message number or sequence name or nil.
- ;; SEND-ARGS is an optional argument passed to the send command.
- ;; The TO, SUBJECT, and CC fields are passed to the
- ;; mh-compose-letter-function.
- ;; If ANNOTATE-CHAR is non-null, it is used to notate the scan listing of the
- ;; message. In that case, the ANNOTATE-FIELD is used to build a string
- ;; for mh-annotate-msg.
- ;; CONFIG is the window configuration to restore after sending the letter.
+ "Edit and compose a draft message in buffer DRAFT and send or save it.
+SEND-ARGS is the argument passed to the send command.
+SENT-FROM-FOLDER is buffer containing scan listing of current folder, or
+nil if none exists.
+SENT-FROM-MSG is the message number or sequence name or nil.
+The TO, SUBJECT, and CC fields are passed to the
+`mh-compose-letter-function'.
+If ANNOTATE-CHAR is non-null, it is used to notate the scan listing of the
+message. In that case, the ANNOTATE-FIELD is used to build a string
+for `mh-annotate-msg'.
+CONFIG is the window configuration to restore after sending the letter."
(pop-to-buffer draft)
+ (if mh-insert-mail-followup-to-flag (mh-insert-mail-followup-to))
(mh-letter-mode)
(setq mh-sent-from-folder sent-from-folder)
(setq mh-sent-from-msg sent-from-msg)
(setq value (cdr value)))
(funcall mh-compose-letter-function to subject cc)))))
+(defun mh-letter-mode-message ()
+ "Display a help message for users of `mh-letter-mode'.
+This should be the last function called when composing the draft."
+ (message "%s" (substitute-command-keys
+ (concat "Type \\[mh-send-letter] to send message, "
+ "\\[mh-help] for help."))))
(defun mh-send-letter (&optional arg)
"Send the draft letter in the current buffer.
If optional prefix argument ARG is provided, monitor delivery.
-Run `mh-before-send-letter-hook' before actually doing anything.
-Run `\\[mh-edit-mhn]' if variable `mh-mhn-compose-insert-p' is set."
+The value of `mh-before-send-letter-hook' is a list of functions to be called,
+with no arguments, before doing anything.
+Run `\\[mh-edit-mhn]' if variable `mh-mhn-compose-insert-flag' is set."
(interactive "P")
(run-hooks 'mh-before-send-letter-hook)
- (if (and (boundp 'mh-mhn-compose-insert-p)
- mh-mhn-compose-insert-p)
- (mh-edit-mhn))
- (if mh-insert-x-mailer-p (mh-insert-x-mailer))
+ (cond
+ ((and (boundp 'mh-mhn-compose-insert-flag)
+ mh-mhn-compose-insert-flag)
+ (mh-edit-mhn))
+ ((and (boundp 'mh-mml-compose-insert-flag)
+ mh-mml-compose-insert-flag)
+ (mh-mml-to-mime)))
+ (if mh-insert-x-mailer-flag (mh-insert-x-mailer))
+ (mh-insert-x-face)
(save-buffer)
(message "Sending...")
(let ((draft-buffer (current-buffer))
(and (boundp 'default-buffer-file-coding-system )
default-buffer-file-coding-system)
'iso-latin-1))))
+ ;; The default BCC encapsulation will make a MIME message unreadable.
+ ;; With nmh use the -mime arg to prevent this.
+ (if (and mh-nmh-flag
+ (mh-goto-header-field "Bcc:")
+ (mh-goto-header-field "Content-Type:"))
+ (setq mh-send-args (format "-mime %s" mh-send-args)))
(cond (arg
(pop-to-buffer "MH mail delivery")
(erase-buffer)
(message "Sending...done")
(message "Sending...backgrounded"))))
-
(defun mh-insert-letter (folder message verbatim)
"Insert a message into the current letter.
-Removes the message's headers using `mh-invisible-headers'. Prefixes
-each non-blank line with `mh-ins-buf-prefix'. Prompts for FOLDER and
-MESSAGE. If prefix argument VERBATIM provided, do not indent and do
-not delete headers. Leaves the mark before the letter and point after it."
+Removes the message's headers using `mh-invisible-headers'. Prefixes each
+non-blank line with `mh-ins-buf-prefix', unless `mh-yank-from-start-of-msg'
+is set for supercite and then use it to format the message.
+Prompts for FOLDER and MESSAGE. If prefix argument VERBATIM provided, do
+not indent and do not delete headers. Leaves the mark before the letter
+and point after it."
(interactive
(list (mh-prompt-for-folder "Message from" mh-sent-from-folder nil)
(read-input (format "Message number%s: "
(narrow-to-region (point) (point))
(let ((start (point-min)))
(if (equal message "") (setq message (int-to-string mh-sent-from-msg)))
- (mh-exec-lib-cmd-output "mhl" "-nobell" "-noclear"
- (expand-file-name message
- (mh-expand-file-name folder)))
- (cond ((not verbatim)
- (mh-clean-msg-header start mh-invisible-headers mh-visible-headers)
- (set-mark start) ; since mh-clean-msg-header moves it
- (mh-insert-prefix-string mh-ins-buf-prefix))))))
-
+ (insert-file-contents
+ (expand-file-name message (mh-expand-file-name folder)))
+ (when (not verbatim)
+ (mh-clean-msg-header start mh-invisible-headers mh-visible-headers)
+ (goto-char (point-max)) ;Needed for sc-cite-original
+ (push-mark) ;Needed for sc-cite-original
+ (goto-char (point-min)) ;Needed for sc-cite-original
+ (mh-insert-prefix-string mh-ins-buf-prefix)))))
+
+(defun mh-extract-from-attribution ()
+ "Extract phrase or comment from From header field."
+ (save-excursion
+ (if (not (mh-goto-header-field "From: "))
+ nil
+ (skip-chars-forward " ")
+ (cond
+ ((looking-at "\"\\([^\"\n]+\\)\" \\(<.+>\\)")
+ (format "%s %s %s" (match-string 1)(match-string 2)
+ mh-extract-from-attribution-verb))
+ ((looking-at "\\([^<\n]+<.+>\\)$")
+ (format "%s %s" (match-string 1) mh-extract-from-attribution-verb))
+ ((looking-at "\\([^ ]+@[^ ]+\\) +(\\(.+\\))$")
+ (format "%s <%s> %s" (match-string 2)(match-string 1)
+ mh-extract-from-attribution-verb))
+ ((looking-at " *\\(.+\\)$")
+ (format "%s %s" (match-string 1) mh-extract-from-attribution-verb))))))
(defun mh-yank-cur-msg ()
"Insert the current message into the draft buffer.
only the region will be inserted. Otherwise, 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
+If `mh-delete-yanked-msg-window-flag' is non-nil, any window displaying the
yanked message will be deleted."
(interactive)
- (if (and mh-sent-from-folder mh-sent-from-msg)
+ (if (and mh-sent-from-folder
+ (save-excursion (set-buffer mh-sent-from-folder) mh-show-buffer)
+ (save-excursion (set-buffer mh-sent-from-folder)
+ (get-buffer mh-show-buffer))
+ mh-sent-from-msg)
(let ((to-point (point))
(to-buffer (current-buffer)))
(set-buffer mh-sent-from-folder)
- (if mh-delete-yanked-msg-window
+ (if mh-delete-yanked-msg-window-flag
(delete-windows-on mh-show-buffer))
(set-buffer mh-show-buffer) ; Find displayed message
- (let ((mh-ins-str (cond ((if (boundp 'mark-active)
- mark-active ;Emacs 19
- (mark)) ;Emacs 18
- (buffer-substring (region-beginning)
- (region-end)))
- ((eq 'body mh-yank-from-start-of-msg)
- (buffer-substring
- (save-excursion
- (goto-char (point-min))
- (mh-goto-header-end 1)
- (point))
- (point-max)))
- (mh-yank-from-start-of-msg
- (buffer-substring (point-min) (point-max)))
- (t
- (buffer-substring (point) (point-max))))))
+ (let* ((from-attr (mh-extract-from-attribution))
+ (yank-region (mh-mark-active-p nil))
+ (mh-ins-str
+ (cond ((and yank-region
+ (or (eq 'supercite mh-yank-from-start-of-msg)
+ (eq 'autosupercite mh-yank-from-start-of-msg)
+ (eq t mh-yank-from-start-of-msg)))
+ ;; supercite needs the full header
+ (concat
+ (buffer-substring (point-min) (mail-header-end))
+ "\n"
+ (buffer-substring (region-beginning) (region-end))))
+ (yank-region
+ (buffer-substring (region-beginning) (region-end)))
+ ((or (eq 'body mh-yank-from-start-of-msg)
+ (eq 'attribution
+ mh-yank-from-start-of-msg)
+ (eq 'autoattrib
+ mh-yank-from-start-of-msg))
+ (buffer-substring
+ (save-excursion
+ (goto-char (point-min))
+ (mh-goto-header-end 1)
+ (point))
+ (point-max)))
+ ((or (eq 'supercite mh-yank-from-start-of-msg)
+ (eq 'autosupercite mh-yank-from-start-of-msg)
+ (eq t mh-yank-from-start-of-msg))
+ (buffer-substring (point-min) (point-max)))
+ (t
+ (buffer-substring (point) (point-max))))))
(set-buffer to-buffer)
(save-restriction
(narrow-to-region to-point to-point)
- (push-mark)
- (insert mh-ins-str)
+ (insert (mh-filter-out-non-text mh-ins-str))
+ (goto-char (point-max)) ;Needed for sc-cite-original
+ (push-mark) ;Needed for sc-cite-original
+ (goto-char (point-min)) ;Needed for sc-cite-original
(mh-insert-prefix-string mh-ins-buf-prefix)
- (insert "\n"))))
+ (if (or (eq 'attribution mh-yank-from-start-of-msg)
+ (eq 'autoattrib mh-yank-from-start-of-msg))
+ (insert from-attr "\n\n"))
+ ;; If the user has selected a region, he has already "edited" the
+ ;; text, so leave the cursor at the end of the yanked text. In
+ ;; either case, leave a mark at the opposite end of the included
+ ;; text to make it easy to jump or delete to the other end of the
+ ;; text.
+ (push-mark)
+ (goto-char (point-max))
+ (if (null yank-region)
+ (mh-exchange-point-and-mark-preserving-active-mark)))))
(error "There is no current message")))
+(defun mh-filter-out-non-text (string)
+ "Return STRING but without adornments such as MIME buttons and smileys."
+ (with-temp-buffer
+ ;; Insert the string to filter
+ (insert string)
+ (goto-char (point-min))
+
+ ;; Remove the MIME buttons
+ (let ((can-move-forward t)
+ (in-button nil))
+ (while can-move-forward
+ (cond ((and (not (get-text-property (point) 'mh-data))
+ in-button)
+ (delete-region (save-excursion (forward-line -1) (point))
+ (point))
+ (setq in-button nil))
+ ((get-text-property (point) 'mh-data)
+ (delete-region (point)
+ (save-excursion (forward-line) (point)))
+ (setq in-button t))
+ (t (setq can-move-forward (= (forward-line) 0))))))
+
+ ;; Return the contents without properties... This gets rid of emphasis
+ ;; and smileys
+ (buffer-substring-no-properties (point-min) (point-max))))
(defun mh-insert-prefix-string (mh-ins-string)
- ;; Run mail-citation-hook to insert a prefix string before each line
- ;; in the buffer. Generality for supercite users.
- (set-mark (point-max))
+ "Insert prefix string before each line in buffer.
+The inserted letter is cited using `sc-cite-original' if
+`mh-yank-from-start-of-msg' is one of 'supercite or 'autosupercite. Otherwise,
+simply insert MH-INS-STRING before each line."
(goto-char (point-min))
- (cond (mail-citation-hook
+ (cond ((or (eq mh-yank-from-start-of-msg 'supercite)
+ (eq mh-yank-from-start-of-msg 'autosupercite))
+ (sc-cite-original))
+ (mail-citation-hook
(run-hooks 'mail-citation-hook))
(mh-yank-hooks ;old hook name
(run-hooks 'mh-yank-hooks))
(t
(or (bolp) (forward-line 1))
- (let ((zmacs-regions nil)) ;so "(mark)" works in XEmacs
- (while (< (point) (mark))
- (insert mh-ins-string)
- (forward-line 1))))))
-
+ (while (< (point) (point-max))
+ (insert mh-ins-string)
+ (forward-line 1))
+ (goto-char (point-min))))) ;leave point like sc-cite-original
(defun mh-fully-kill-draft ()
"Kill the draft message file and the draft message buffer.
(set-window-configuration config)))
(error "Message not killed")))
-
(defun mh-current-fill-prefix ()
- ;; Return the fill-prefix on the current line as a string.
+ "Return the `fill-prefix' on the current line as a string."
(save-excursion
(beginning-of-line)
;; This assumes that the major-mode sets up adaptive-fill-regexp
(match-string 0)
"")))
-
(defun mh-open-line ()
"Insert a newline and leave point after it.
In addition, insert newline and quoting characters before text after point.
This is useful in breaking up paragraphs in replies."
(interactive)
(let ((column (current-column))
- (point (point))
(prefix (mh-current-fill-prefix)))
(if (> (length prefix) column)
(message "Sorry, point seems to be within the line prefix")
(insert " "))
(forward-line -1))))
-
;;; Build the letter-mode keymap:
+;;; If this changes, modify mh-letter-mode-help-messages accordingly, above.
(gnus-define-keys mh-letter-mode-map
+ "\C-c?" mh-help
+ "\C-c\C-c" mh-send-letter
+ "\C-c\C-e" mh-edit-mhn
"\C-c\C-f\C-b" mh-to-field
"\C-c\C-f\C-c" mh-to-field
"\C-c\C-f\C-d" mh-to-field
"\C-c\C-fs" mh-to-field
"\C-c\C-ft" mh-to-field
"\C-c\C-i" mh-insert-letter
+ "\C-c\C-m\C-e" mh-mml-secure-message-encrypt-pgpmime
+ "\C-c\C-m\C-f" mh-compose-forward
+ "\C-c\C-m\C-i" mh-compose-insertion
+ "\C-c\C-m\C-m" mh-mml-to-mime
+ "\C-c\C-m\C-s" mh-mml-secure-message-sign-pgpmime
+ "\C-c\C-m\C-u" mh-revert-mhn-edit
+ "\C-c\C-me" mh-mml-secure-message-encrypt-pgpmime
+ "\C-c\C-mf" mh-compose-forward
+ "\C-c\C-mi" mh-compose-insertion
+ "\C-c\C-mm" mh-mml-to-mime
+ "\C-c\C-ms" mh-mml-secure-message-sign-pgpmime
+ "\C-c\C-mu" mh-revert-mhn-edit
"\C-c\C-o" mh-open-line
"\C-c\C-q" mh-fully-kill-draft
"\C-c\C-\\" mh-fully-kill-draft ;if no C-q
"\C-c\C-s" mh-insert-signature
"\C-c\C-^" mh-insert-signature ;if no C-s
"\C-c\C-w" mh-check-whom
- "\C-c\C-y" mh-yank-cur-msg
- "\C-c\C-c" mh-send-letter
- "\C-c\C-m\C-f" mh-mhn-compose-forw
- "\C-c\C-m\C-e" mh-mhn-compose-anon-ftp
- "\C-c\C-m\C-t" mh-mhn-compose-external-compressed-tar
- "\C-c\C-m\C-i" mh-mhn-compose-insertion
- "\C-c\C-e" mh-edit-mhn
- "\C-c\C-m\C-u" mh-revert-mhn-edit)
+ "\C-c\C-y" mh-yank-cur-msg)
;; "C-c /" prefix is used in mh-letter-mode by pgp.el and mailcrypt.el.
-;;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
-(cond
- ((fboundp 'easy-menu-define)
- (easy-menu-define
- mh-letter-menu mh-letter-mode-map "Menu for mh-e letter mode."
- '("Letter"
- ["Send This Draft" mh-send-letter t]
- ["Split Current Line" mh-open-line t]
- ["Check Recipient" mh-check-whom t]
- ["Yank Current Message" mh-yank-cur-msg t]
- ["Insert a Message..." mh-insert-letter t]
- ["Insert Signature" mh-insert-signature t]
- ["Compose Insertion (MIME)..." mh-mhn-compose-insertion t]
- ["Compose Compressed tar (MIME)..." mh-mhn-compose-external-compressed-tar t]
- ["Compose Anon FTP (MIME)..." mh-mhn-compose-anon-ftp t]
- ["Compose Forward (MIME)..." mh-mhn-compose-forw t]
- ["Pull in All Compositions (MIME)" mh-edit-mhn t]
- ["Revert to Non-MIME Edit" mh-revert-mhn-edit t]
- ["Kill This Draft" mh-fully-kill-draft t]))))
-
(defun mh-customize ()
- "Customize mh-e variables."
+ "Customize MH-E variables."
(interactive)
(customize-group 'mh))
-;;; Support for emacs21 toolbar using gnus/message.el icons (and code).
-(eval-when-compile (defvar tool-bar-map))
-(when (and (fboundp 'tool-bar-add-item)
- tool-bar-mode)
- (defvar mh-letter-tool-bar-map
- (let ((tool-bar-map (make-sparse-keymap)))
- (tool-bar-add-item "mail_send" 'mh-send-letter 'mh-letter-send
- :help "Send this letter")
- (tool-bar-add-item "attach" 'mh-mhn-compose-insertion 'mh-letter-compose
- :help "Insert attachment")
- (tool-bar-add-item "spell" 'ispell-message 'mh-letter-ispell
- :help "Check spelling")
- (tool-bar-add-item-from-menu 'save-buffer "save")
- (tool-bar-add-item-from-menu 'undo "undo")
- (tool-bar-add-item-from-menu 'kill-region "cut")
- (tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy")
- (tool-bar-add-item "close" 'mh-fully-kill-draft 'mh-letter-kill
- :help "Kill this draft")
- (tool-bar-add-item "preferences" (lambda ()
- (interactive)
- (customize-group "mh-compose"))
- 'mh-letter-customize
- :help "mh-e composition preferences")
- (tool-bar-add-item "help" (lambda ()
- (interactive)
- (Info-goto-node "(mh-e)Draft Editing"))
- 'mh-letter-help :help "Help")
- tool-bar-map)))
+(provide 'mh-comp)
+
+;;; Local Variables:
+;;; sentence-end-double-space: nil
+;;; End:
;;; mh-comp.el ends here