2004-09-04 13:13:48 +00:00
|
|
|
;;; mml.el --- A package for parsing and validating MML documents
|
2005-08-06 19:51:42 +00:00
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-09-19 13:40:08 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-05-06 03:56:49 +00:00
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2000-09-19 13:40:08 +00:00
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2010-10-11 23:29:33 +00:00
|
|
|
;; For Emacs <22.2 and XEmacs.
|
2007-12-11 05:28:59 +00:00
|
|
|
(eval-and-compile
|
|
|
|
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(require 'mm-util)
|
|
|
|
(require 'mm-bodies)
|
|
|
|
(require 'mm-encode)
|
|
|
|
(require 'mm-decode)
|
2004-09-04 13:13:48 +00:00
|
|
|
(require 'mml-sec)
|
2000-11-01 16:27:08 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2010-05-06 04:15:34 +00:00
|
|
|
(eval-when-compile
|
|
|
|
(when (featurep 'xemacs)
|
|
|
|
(require 'easy-mmode))) ; for `define-minor-mode'
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'message-make-message-id "message")
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
(declare-function gnus-setup-posting-charset "gnus-msg" (group))
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'gnus-make-local-hook "gnus-util")
|
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
2010-09-30 08:39:23 +00:00
|
|
|
(autoload 'gnus-completing-read "gnus-util")
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'message-fetch-field "message")
|
|
|
|
(autoload 'message-mark-active-p "message")
|
|
|
|
(autoload 'message-info "message")
|
|
|
|
(autoload 'fill-flowed-encode "flow-fill")
|
|
|
|
(autoload 'message-posting-charset "message")
|
|
|
|
(autoload 'dnd-get-local-file-name "dnd")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2007-12-19 02:54:16 +00:00
|
|
|
(autoload 'message-options-set "message")
|
|
|
|
(autoload 'message-narrow-to-head "message")
|
|
|
|
(autoload 'message-in-body-p "message")
|
|
|
|
(autoload 'message-mail-p "message")
|
|
|
|
|
2005-08-31 13:09:02 +00:00
|
|
|
(defvar gnus-article-mime-handles)
|
|
|
|
(defvar gnus-mouse-2)
|
|
|
|
(defvar gnus-newsrc-hashtb)
|
|
|
|
(defvar message-default-charset)
|
|
|
|
(defvar message-deletable-headers)
|
|
|
|
(defvar message-options)
|
|
|
|
(defvar message-posting-charset)
|
|
|
|
(defvar message-required-mail-headers)
|
|
|
|
(defvar message-required-news-headers)
|
2006-04-26 21:58:05 +00:00
|
|
|
(defvar dnd-protocol-alist)
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar mml-dnd-protocol-alist)
|
2005-08-31 13:09:02 +00:00
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom mml-content-type-parameters
|
|
|
|
'(name access-type expiration size permission format)
|
|
|
|
"*A list of acceptable parameters in MML tag.
|
|
|
|
These parameters are generated in Content-Type header if exists."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (symbol :tag "Parameter"))
|
|
|
|
:group 'message)
|
|
|
|
|
|
|
|
(defcustom mml-content-disposition-parameters
|
|
|
|
'(filename creation-date modification-date read-date)
|
|
|
|
"*A list of acceptable parameters in MML tag.
|
|
|
|
These parameters are generated in Content-Disposition header if exists."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (symbol :tag "Parameter"))
|
|
|
|
:group 'message)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom mml-content-disposition-alist
|
|
|
|
'((text (rtf . "attachment") (t . "inline"))
|
|
|
|
(t . "attachment"))
|
|
|
|
"Alist of MIME types or regexps matching file names and default dispositions.
|
|
|
|
Each element should be one of the following three forms:
|
|
|
|
|
|
|
|
(REGEXP . DISPOSITION)
|
|
|
|
(SUPERTYPE (SUBTYPE . DISPOSITION) (SUBTYPE . DISPOSITION)...)
|
|
|
|
(TYPE . DISPOSITION)
|
|
|
|
|
|
|
|
Where REGEXP is a string which matches the file name (if any) of an
|
|
|
|
attachment, SUPERTYPE, SUBTYPE and TYPE should be symbols which are a
|
|
|
|
MIME supertype (e.g., text), a MIME subtype (e.g., plain) and a MIME
|
|
|
|
type (e.g., text/plain) respectively, and DISPOSITION should be either
|
|
|
|
the string \"attachment\" or the string \"inline\". The value t for
|
|
|
|
SUPERTYPE, SUBTYPE or TYPE matches any of those types. The first
|
|
|
|
match found will be used."
|
2008-02-29 04:03:49 +00:00
|
|
|
:version "23.1" ;; No Gnus
|
2007-10-28 09:18:39 +00:00
|
|
|
:type (let ((dispositions '(radio :format "DISPOSITION: %v"
|
|
|
|
:value "attachment"
|
|
|
|
(const :format "%v " "attachment")
|
|
|
|
(const :format "%v\n" "inline"))))
|
|
|
|
`(repeat
|
|
|
|
:offset 0
|
|
|
|
(choice :format "%[Value Menu%]%v"
|
|
|
|
(cons :tag "(REGEXP . DISPOSITION)" :extra-offset 4
|
|
|
|
(regexp :tag "REGEXP" :value ".*")
|
|
|
|
,dispositions)
|
|
|
|
(cons :tag "(SUPERTYPE (SUBTYPE . DISPOSITION)...)"
|
|
|
|
:indent 0
|
|
|
|
(symbol :tag " SUPERTYPE" :value text)
|
|
|
|
(repeat :format "%v%i\n" :offset 0 :extra-offset 4
|
|
|
|
(cons :format "%v" :extra-offset 5
|
|
|
|
(symbol :tag "SUBTYPE" :value t)
|
|
|
|
,dispositions)))
|
|
|
|
(cons :tag "(TYPE . DISPOSITION)" :extra-offset 4
|
|
|
|
(symbol :tag "TYPE" :value t)
|
|
|
|
,dispositions))))
|
|
|
|
:group 'message)
|
|
|
|
|
2010-08-31 00:11:37 +00:00
|
|
|
(defcustom mml-insert-mime-headers-always t
|
2004-09-04 13:13:48 +00:00
|
|
|
"If non-nil, always put Content-Type: text/plain at top of empty parts.
|
|
|
|
It is necessary to work against a bug in certain clients."
|
2010-08-31 04:21:18 +00:00
|
|
|
:version "24.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'message)
|
|
|
|
|
2010-10-16 01:55:08 +00:00
|
|
|
(defcustom mml-enable-flowed t
|
|
|
|
"If non-nil, enable format=flowed usage when encoding a message.
|
|
|
|
This is only performed when filling on text/plain with hard
|
|
|
|
newlines in the text."
|
|
|
|
:version "24.1"
|
|
|
|
:type 'boolean
|
|
|
|
:group 'message)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defvar mml-tweak-type-alist nil
|
|
|
|
"A list of (TYPE . FUNCTION) for tweaking MML parts.
|
|
|
|
TYPE is a string containing a regexp to match the MIME type. FUNCTION
|
|
|
|
is a Lisp function which is called with the MML handle to tweak the
|
|
|
|
part. This variable is used only when no TWEAK parameter exists in
|
|
|
|
the MML handle.")
|
|
|
|
|
|
|
|
(defvar mml-tweak-function-alist nil
|
|
|
|
"A list of (NAME . FUNCTION) for tweaking MML parts.
|
|
|
|
NAME is a string containing the name of the TWEAK parameter in the MML
|
|
|
|
handle. FUNCTION is a Lisp function which is called with the MML
|
|
|
|
handle to tweak the part.")
|
|
|
|
|
|
|
|
(defvar mml-tweak-sexp-alist
|
|
|
|
'((mml-externalize-attachments . mml-tweak-externalize-attachments))
|
|
|
|
"A list of (SEXP . FUNCTION) for tweaking MML parts.
|
|
|
|
SEXP is an s-expression. If the evaluation of SEXP is non-nil, FUNCTION
|
|
|
|
is called. FUNCTION is a Lisp function which is called with the MML
|
|
|
|
handle to tweak the part.")
|
|
|
|
|
|
|
|
(defvar mml-externalize-attachments nil
|
|
|
|
"*If non-nil, local-file attachments are generated as external parts.")
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defvar mml-generate-multipart-alist nil
|
|
|
|
"*Alist of multipart generation functions.
|
|
|
|
Each entry has the form (NAME . FUNCTION), where
|
2003-02-04 13:24:35 +00:00
|
|
|
NAME is a string containing the name of the part (without the
|
2000-09-19 13:40:08 +00:00
|
|
|
leading \"/multipart/\"),
|
|
|
|
FUNCTION is a Lisp function which is called to generate the part.
|
|
|
|
|
|
|
|
The Lisp function has to supply the appropriate MIME headers and the
|
|
|
|
contents of this part.")
|
|
|
|
|
|
|
|
(defvar mml-syntax-table
|
|
|
|
(let ((table (copy-syntax-table emacs-lisp-mode-syntax-table)))
|
|
|
|
(modify-syntax-entry ?\\ "/" table)
|
|
|
|
(modify-syntax-entry ?< "(" table)
|
|
|
|
(modify-syntax-entry ?> ")" table)
|
|
|
|
(modify-syntax-entry ?@ "w" table)
|
|
|
|
(modify-syntax-entry ?/ "w" table)
|
|
|
|
(modify-syntax-entry ?= " " table)
|
|
|
|
(modify-syntax-entry ?* " " table)
|
|
|
|
(modify-syntax-entry ?\; " " table)
|
|
|
|
(modify-syntax-entry ?\' " " table)
|
|
|
|
table))
|
|
|
|
|
|
|
|
(defvar mml-boundary-function 'mml-make-boundary
|
|
|
|
"A function called to suggest a boundary.
|
|
|
|
The function may be called several times, and should try to make a new
|
|
|
|
suggestion each time. The function is called with one parameter,
|
|
|
|
which is a number that says how many times the function has been
|
|
|
|
called for this message.")
|
|
|
|
|
|
|
|
(defvar mml-confirmation-set nil
|
|
|
|
"A list of symbols, each of which disables some warning.
|
|
|
|
`unknown-encoding': always send messages contain characters with
|
|
|
|
unknown encoding; `use-ascii': always use ASCII for those characters
|
|
|
|
with unknown encoding; `multipart': always send messages with more than
|
|
|
|
one charsets.")
|
|
|
|
|
2005-07-31 00:12:23 +00:00
|
|
|
(defvar mml-generate-default-type "text/plain"
|
|
|
|
"Content type by which the Content-Type header can be omitted.
|
|
|
|
The Content-Type header will not be put in the MIME part if the type
|
|
|
|
equals the value and there's no parameter (e.g. charset, format, etc.)
|
|
|
|
and `mml-insert-mime-headers-always' is nil. The value will be bound
|
|
|
|
to \"message/rfc822\" when encoding an article to be forwarded as a MIME
|
|
|
|
part. This is for the internal use, you should never modify the value.")
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defvar mml-buffer-list nil)
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
(defun mml-generate-new-buffer (name)
|
2000-09-19 13:40:08 +00:00
|
|
|
(let ((buf (generate-new-buffer name)))
|
|
|
|
(push buf mml-buffer-list)
|
|
|
|
buf))
|
|
|
|
|
|
|
|
(defun mml-destroy-buffers ()
|
|
|
|
(let (kill-buffer-hook)
|
2007-10-28 09:18:39 +00:00
|
|
|
(mapc 'kill-buffer mml-buffer-list)
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq mml-buffer-list nil)))
|
|
|
|
|
|
|
|
(defun mml-parse ()
|
|
|
|
"Parse the current buffer as an MML document."
|
2004-09-04 13:13:48 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
2007-10-28 09:18:39 +00:00
|
|
|
(with-syntax-table mml-syntax-table
|
|
|
|
(mml-parse-1))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-parse-1 ()
|
|
|
|
"Parse the current buffer as an MML document."
|
|
|
|
(let (struct tag point contents charsets warn use-ascii no-markup-p raw)
|
|
|
|
(while (and (not (eobp))
|
|
|
|
(not (looking-at "<#/multipart")))
|
|
|
|
(cond
|
2004-09-04 13:13:48 +00:00
|
|
|
((looking-at "<#secure")
|
|
|
|
;; The secure part is essentially a meta-meta tag, which
|
|
|
|
;; expands to either a part tag if there are no other parts in
|
|
|
|
;; the document or a multipart tag if there are other parts
|
|
|
|
;; included in the message
|
|
|
|
(let* (secure-mode
|
|
|
|
(taginfo (mml-read-tag))
|
2007-10-28 09:18:39 +00:00
|
|
|
(keyfile (cdr (assq 'keyfile taginfo)))
|
2010-07-21 05:56:18 +00:00
|
|
|
(certfiles (delq nil (mapcar (lambda (tag)
|
|
|
|
(if (eq (car-safe tag) 'certfile)
|
|
|
|
(cdr tag)))
|
|
|
|
taginfo)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(recipients (cdr (assq 'recipients taginfo)))
|
|
|
|
(sender (cdr (assq 'sender taginfo)))
|
|
|
|
(location (cdr (assq 'tag-location taginfo)))
|
|
|
|
(mode (cdr (assq 'mode taginfo)))
|
|
|
|
(method (cdr (assq 'method taginfo)))
|
|
|
|
tags)
|
|
|
|
(save-excursion
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (re-search-forward
|
|
|
|
"<#/?\\(multipart\\|part\\|external\\|mml\\)." nil t)
|
2004-09-04 13:13:48 +00:00
|
|
|
(setq secure-mode "multipart")
|
|
|
|
(setq secure-mode "part")))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char location)
|
|
|
|
(re-search-forward "<#secure[^\n]*>\n"))
|
|
|
|
(delete-region (match-beginning 0) (match-end 0))
|
|
|
|
(cond ((string= mode "sign")
|
|
|
|
(setq tags (list "sign" method)))
|
|
|
|
((string= mode "encrypt")
|
|
|
|
(setq tags (list "encrypt" method)))
|
|
|
|
((string= mode "signencrypt")
|
|
|
|
(setq tags (list "sign" method "encrypt" method))))
|
|
|
|
(eval `(mml-insert-tag ,secure-mode
|
|
|
|
,@tags
|
2007-10-28 09:18:39 +00:00
|
|
|
,(if keyfile "keyfile")
|
|
|
|
,keyfile
|
2010-07-21 05:56:18 +00:00
|
|
|
,@(apply #'append
|
|
|
|
(mapcar (lambda (certfile)
|
|
|
|
(list "certfile" certfile))
|
|
|
|
certfiles))
|
2004-09-04 13:13:48 +00:00
|
|
|
,(if recipients "recipients")
|
|
|
|
,recipients
|
|
|
|
,(if sender "sender")
|
|
|
|
,sender))
|
|
|
|
;; restart the parse
|
|
|
|
(goto-char location)))
|
2000-09-19 13:40:08 +00:00
|
|
|
((looking-at "<#multipart")
|
|
|
|
(push (nconc (mml-read-tag) (mml-parse-1)) struct))
|
|
|
|
((looking-at "<#external")
|
|
|
|
(push (nconc (mml-read-tag) (list (cons 'contents (mml-read-part))))
|
|
|
|
struct))
|
|
|
|
(t
|
|
|
|
(if (or (looking-at "<#part") (looking-at "<#mml"))
|
|
|
|
(setq tag (mml-read-tag)
|
|
|
|
no-markup-p nil
|
|
|
|
warn nil)
|
|
|
|
(setq tag (list 'part '(type . "text/plain"))
|
|
|
|
no-markup-p t
|
|
|
|
warn t))
|
|
|
|
(setq raw (cdr (assq 'raw tag))
|
|
|
|
point (point)
|
2000-09-20 11:46:48 +00:00
|
|
|
contents (mml-read-part (eq 'mml (car tag)))
|
2004-09-04 13:13:48 +00:00
|
|
|
charsets (cond
|
|
|
|
(raw nil)
|
|
|
|
((assq 'charset tag)
|
|
|
|
(list
|
|
|
|
(intern (downcase (cdr (assq 'charset tag))))))
|
|
|
|
(t
|
2008-02-24 15:23:45 +00:00
|
|
|
(mm-find-mime-charset-region point (point)
|
|
|
|
mm-hack-charsets))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (and (not raw) (memq nil charsets))
|
|
|
|
(if (or (memq 'unknown-encoding mml-confirmation-set)
|
2004-09-04 13:13:48 +00:00
|
|
|
(message-options-get 'unknown-encoding)
|
|
|
|
(and (y-or-n-p "\
|
|
|
|
Message contains characters with unknown encoding. Really send? ")
|
|
|
|
(message-options-set 'unknown-encoding t)))
|
2003-02-04 13:24:35 +00:00
|
|
|
(if (setq use-ascii
|
2000-09-19 13:40:08 +00:00
|
|
|
(or (memq 'use-ascii mml-confirmation-set)
|
2004-09-04 13:13:48 +00:00
|
|
|
(message-options-get 'use-ascii)
|
|
|
|
(and (y-or-n-p "Use ASCII as charset? ")
|
|
|
|
(message-options-set 'use-ascii t))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq charsets (delq nil charsets))
|
|
|
|
(setq warn nil))
|
|
|
|
(error "Edit your message to remove those characters")))
|
|
|
|
(if (or raw
|
|
|
|
(eq 'mml (car tag))
|
|
|
|
(< (length charsets) 2))
|
|
|
|
(if (or (not no-markup-p)
|
|
|
|
(string-match "[^ \t\r\n]" contents))
|
|
|
|
;; Don't create blank parts.
|
|
|
|
(push (nconc tag (list (cons 'contents contents)))
|
|
|
|
struct))
|
|
|
|
(let ((nstruct (mml-parse-singlepart-with-multiple-charsets
|
|
|
|
tag point (point) use-ascii)))
|
|
|
|
(when (and warn
|
|
|
|
(not (memq 'multipart mml-confirmation-set))
|
2004-09-04 13:13:48 +00:00
|
|
|
(not (message-options-get 'multipart))
|
|
|
|
(not (and (y-or-n-p (format "\
|
2001-01-08 19:25:35 +00:00
|
|
|
A message part needs to be split into %d charset parts. Really send? "
|
2004-09-04 13:13:48 +00:00
|
|
|
(length nstruct)))
|
|
|
|
(message-options-set 'multipart t))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(error "Edit your message to use only one charset"))
|
|
|
|
(setq struct (nconc nstruct struct)))))))
|
|
|
|
(unless (eobp)
|
|
|
|
(forward-line 1))
|
|
|
|
(nreverse struct)))
|
|
|
|
|
2003-02-04 13:24:35 +00:00
|
|
|
(defun mml-parse-singlepart-with-multiple-charsets
|
2000-09-19 13:40:08 +00:00
|
|
|
(orig-tag beg end &optional use-ascii)
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region beg end)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((current (or (mm-mime-charset (mm-charset-after))
|
|
|
|
(and use-ascii 'us-ascii)))
|
|
|
|
charset struct space newline paragraph)
|
|
|
|
(while (not (eobp))
|
|
|
|
(setq charset (mm-mime-charset (mm-charset-after)))
|
|
|
|
(cond
|
|
|
|
;; The charset remains the same.
|
|
|
|
((eq charset 'us-ascii))
|
|
|
|
((or (and use-ascii (not charset))
|
|
|
|
(eq charset current))
|
|
|
|
(setq space nil
|
|
|
|
newline nil
|
|
|
|
paragraph nil))
|
|
|
|
;; The initial charset was ascii.
|
|
|
|
((eq current 'us-ascii)
|
|
|
|
(setq current charset
|
|
|
|
space nil
|
|
|
|
newline nil
|
|
|
|
paragraph nil))
|
|
|
|
;; We have a change in charsets.
|
|
|
|
(t
|
|
|
|
(push (append
|
|
|
|
orig-tag
|
|
|
|
(list (cons 'contents
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
beg (or paragraph newline space (point))))))
|
|
|
|
struct)
|
|
|
|
(setq beg (or paragraph newline space (point))
|
|
|
|
current charset
|
|
|
|
space nil
|
|
|
|
newline nil
|
|
|
|
paragraph nil)))
|
|
|
|
;; Compute places where it might be nice to break the part.
|
|
|
|
(cond
|
|
|
|
((memq (following-char) '(? ?\t))
|
|
|
|
(setq space (1+ (point))))
|
|
|
|
((and (eq (following-char) ?\n)
|
|
|
|
(not (bobp))
|
|
|
|
(eq (char-after (1- (point))) ?\n))
|
|
|
|
(setq paragraph (point)))
|
|
|
|
((eq (following-char) ?\n)
|
|
|
|
(setq newline (1+ (point)))))
|
|
|
|
(forward-char 1))
|
|
|
|
;; Do the final part.
|
|
|
|
(unless (= beg (point))
|
|
|
|
(push (append orig-tag
|
|
|
|
(list (cons 'contents
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
beg (point)))))
|
|
|
|
struct))
|
|
|
|
struct))))
|
|
|
|
|
|
|
|
(defun mml-read-tag ()
|
|
|
|
"Read a tag and return the contents."
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((orig-point (point))
|
|
|
|
contents name elem val)
|
2000-09-19 13:40:08 +00:00
|
|
|
(forward-char 2)
|
|
|
|
(setq name (buffer-substring-no-properties
|
|
|
|
(point) (progn (forward-sexp 1) (point))))
|
|
|
|
(skip-chars-forward " \t\n")
|
2004-09-04 13:13:48 +00:00
|
|
|
(while (not (looking-at ">[ \t]*\n?"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq elem (buffer-substring-no-properties
|
|
|
|
(point) (progn (forward-sexp 1) (point))))
|
|
|
|
(skip-chars-forward "= \t\n")
|
|
|
|
(setq val (buffer-substring-no-properties
|
|
|
|
(point) (progn (forward-sexp 1) (point))))
|
2010-03-17 02:51:21 +00:00
|
|
|
(when (string-match "\\`\"" val)
|
|
|
|
(setq val (read val))) ;; inverse of prin1 in mml-insert-tag
|
2000-09-19 13:40:08 +00:00
|
|
|
(push (cons (intern elem) val) contents)
|
|
|
|
(skip-chars-forward " \t\n"))
|
2004-09-04 13:13:48 +00:00
|
|
|
(goto-char (match-end 0))
|
|
|
|
;; Don't skip the leading space.
|
|
|
|
;;(skip-chars-forward " \t\n")
|
|
|
|
;; Put the tag location into the returned contents
|
|
|
|
(setq contents (append (list (cons 'tag-location orig-point)) contents))
|
2000-09-19 13:40:08 +00:00
|
|
|
(cons (intern name) (nreverse contents))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-buffer-substring-no-properties-except-hard-newlines (start end)
|
|
|
|
(let ((str (buffer-substring-no-properties start end))
|
|
|
|
(bufstart start) tmp)
|
|
|
|
(while (setq tmp (text-property-any start end 'hard 't))
|
|
|
|
(set-text-properties (- tmp bufstart) (- tmp bufstart -1)
|
|
|
|
'(hard t) str)
|
|
|
|
(setq start (1+ tmp)))
|
|
|
|
str))
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-read-part (&optional mml)
|
|
|
|
"Return the buffer up till the next part, multipart or closing part or multipart.
|
|
|
|
If MML is non-nil, return the buffer up till the correspondent mml tag."
|
|
|
|
(let ((beg (point)) (count 1))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; If the tag ended at the end of the line, we go to the next line.
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (looking-at "[ \t]*\n")
|
|
|
|
(forward-line 1))
|
|
|
|
(if mml
|
|
|
|
(progn
|
|
|
|
(while (and (> count 0) (not (eobp)))
|
|
|
|
(if (re-search-forward "<#\\(/\\)?mml." nil t)
|
|
|
|
(setq count (+ count (if (match-beginning 1) -1 1)))
|
|
|
|
(goto-char (point-max))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-buffer-substring-no-properties-except-hard-newlines
|
|
|
|
beg (if (> count 0)
|
|
|
|
(point)
|
|
|
|
(match-beginning 0))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(if (re-search-forward
|
|
|
|
"<#\\(/\\)?\\(multipart\\|part\\|external\\|mml\\)." nil t)
|
|
|
|
(prog1
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-buffer-substring-no-properties-except-hard-newlines
|
|
|
|
beg (match-beginning 0))
|
2000-09-19 13:40:08 +00:00
|
|
|
(if (or (not (match-beginning 1))
|
|
|
|
(equal (match-string 2) "multipart"))
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(when (looking-at "[ \t]*\n")
|
|
|
|
(forward-line 1))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-buffer-substring-no-properties-except-hard-newlines
|
|
|
|
beg (goto-char (point-max)))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defvar mml-boundary nil)
|
|
|
|
(defvar mml-base-boundary "-=-=")
|
|
|
|
(defvar mml-multipart-number 0)
|
|
|
|
|
|
|
|
(defun mml-generate-mime ()
|
|
|
|
"Generate a MIME message based on the current MML document."
|
|
|
|
(let ((cont (mml-parse))
|
|
|
|
(mml-multipart-number mml-multipart-number))
|
|
|
|
(if (not cont)
|
|
|
|
nil
|
2007-08-27 04:00:19 +00:00
|
|
|
(mm-with-multibyte-buffer
|
2000-09-19 13:40:08 +00:00
|
|
|
(if (and (consp (car cont))
|
|
|
|
(= (length cont) 1))
|
|
|
|
(mml-generate-mime-1 (car cont))
|
|
|
|
(mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
|
|
|
|
cont)))
|
|
|
|
(buffer-string)))))
|
|
|
|
|
|
|
|
(defun mml-generate-mime-1 (cont)
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((mm-use-ultra-safe-encoding
|
|
|
|
(or mm-use-ultra-safe-encoding (assq 'sign cont))))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(mml-tweak-part cont)
|
|
|
|
(cond
|
|
|
|
((or (eq (car cont) 'part) (eq (car cont) 'mml))
|
2005-07-31 00:12:23 +00:00
|
|
|
(let* ((raw (cdr (assq 'raw cont)))
|
|
|
|
(filename (cdr (assq 'filename cont)))
|
|
|
|
(type (or (cdr (assq 'type cont))
|
2005-08-02 07:21:08 +00:00
|
|
|
(if filename
|
|
|
|
(or (mm-default-file-encoding filename)
|
|
|
|
"application/octet-stream")
|
|
|
|
"text/plain")))
|
2007-10-28 09:18:39 +00:00
|
|
|
(charset (cdr (assq 'charset cont)))
|
|
|
|
(coding (mm-charset-to-coding-system charset))
|
|
|
|
encoding flowed coded)
|
|
|
|
(cond ((eq coding 'ascii)
|
|
|
|
(setq charset nil
|
|
|
|
coding nil))
|
|
|
|
(charset
|
2008-12-17 00:34:16 +00:00
|
|
|
;; The value of `charset' might be a bogus alias that
|
|
|
|
;; `mm-charset-synonym-alist' provides, like `utf8',
|
|
|
|
;; so we prefer the MIME charset that Emacs knows for
|
|
|
|
;; the coding system `coding'.
|
|
|
|
(setq charset (or (mm-coding-system-to-mime-charset coding)
|
|
|
|
(intern (downcase charset))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (and (not raw)
|
|
|
|
(member (car (split-string type "/")) '("text" "message")))
|
|
|
|
(progn
|
|
|
|
(with-temp-buffer
|
|
|
|
(cond
|
|
|
|
((cdr (assq 'buffer cont))
|
|
|
|
(insert-buffer-substring (cdr (assq 'buffer cont))))
|
2005-07-31 00:12:23 +00:00
|
|
|
((and filename
|
2004-09-04 13:13:48 +00:00
|
|
|
(not (equal (cdr (assq 'nofile cont)) "yes")))
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((coding-system-for-read coding))
|
2004-09-04 13:13:48 +00:00
|
|
|
(mm-insert-file-contents filename)))
|
|
|
|
((eq 'mml (car cont))
|
|
|
|
(insert (cdr (assq 'contents cont))))
|
|
|
|
(t
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(insert (cdr (assq 'contents cont)))
|
|
|
|
;; Remove quotes from quoted tags.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward
|
|
|
|
"<#!+/?\\(part\\|multipart\\|external\\|mml\\)"
|
|
|
|
nil t)
|
|
|
|
(delete-region (+ (match-beginning 0) 2)
|
|
|
|
(+ (match-beginning 0) 3))))))
|
|
|
|
(cond
|
|
|
|
((eq (car cont) 'mml)
|
|
|
|
(let ((mml-boundary (mml-compute-boundary cont))
|
2005-07-31 00:12:23 +00:00
|
|
|
;; It is necessary for the case where this
|
|
|
|
;; function is called recursively since
|
|
|
|
;; `m-g-d-t' will be bound to "message/rfc822"
|
|
|
|
;; when encoding an article to be forwarded.
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-generate-default-type "text/plain"))
|
2010-05-06 03:27:20 +00:00
|
|
|
(mml-to-mime)
|
|
|
|
;; Update handle so mml-compute-boundary can
|
|
|
|
;; detect collisions with the nested parts.
|
|
|
|
(setcdr (assoc 'contents cont) (buffer-string)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
|
|
|
|
;; ignore 0x1b, it is part of iso-2022-jp
|
|
|
|
(setq encoding (mm-body-7-or-8))))
|
|
|
|
((string= (car (split-string type "/")) "message")
|
|
|
|
(let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
|
|
|
|
;; ignore 0x1b, it is part of iso-2022-jp
|
|
|
|
(setq encoding (mm-body-7-or-8))))
|
|
|
|
(t
|
|
|
|
;; Only perform format=flowed filling on text/plain
|
|
|
|
;; parts where there either isn't a format parameter
|
|
|
|
;; in the mml tag or it says "flowed" and there
|
|
|
|
;; actually are hard newlines in the text.
|
|
|
|
(let (use-hard-newlines)
|
2010-10-16 01:55:08 +00:00
|
|
|
(when (and mml-enable-flowed
|
|
|
|
(string= type "text/plain")
|
2004-09-27 07:44:44 +00:00
|
|
|
(not (string= (cdr (assq 'sign cont)) "pgp"))
|
2004-09-04 13:13:48 +00:00
|
|
|
(or (null (assq 'format cont))
|
|
|
|
(string= (cdr (assq 'format cont))
|
|
|
|
"flowed"))
|
|
|
|
(setq use-hard-newlines
|
|
|
|
(text-property-any
|
|
|
|
(point-min) (point-max) 'hard 't)))
|
|
|
|
(fill-flowed-encode)
|
|
|
|
;; Indicate that `mml-insert-mime-headers' should
|
|
|
|
;; insert a "; format=flowed" string unless the
|
|
|
|
;; user has already specified it.
|
|
|
|
(setq flowed (null (assq 'format cont)))))
|
2007-10-28 09:18:39 +00:00
|
|
|
;; Prefer `utf-8' for text/calendar parts.
|
|
|
|
(if (or charset
|
|
|
|
(not (string= type "text/calendar")))
|
|
|
|
(setq charset (mm-encode-body charset))
|
|
|
|
(let ((mm-coding-system-priorities
|
|
|
|
(cons 'utf-8 mm-coding-system-priorities)))
|
|
|
|
(setq charset (mm-encode-body))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(setq encoding (mm-body-encoding
|
|
|
|
charset (cdr (assq 'encoding cont))))))
|
|
|
|
(setq coded (buffer-string)))
|
|
|
|
(mml-insert-mime-headers cont type charset encoding flowed)
|
|
|
|
(insert "\n")
|
|
|
|
(insert coded))
|
|
|
|
(mm-with-unibyte-buffer
|
|
|
|
(cond
|
|
|
|
((cdr (assq 'buffer cont))
|
2006-11-16 11:10:48 +00:00
|
|
|
(insert (mm-string-as-unibyte
|
|
|
|
(with-current-buffer (cdr (assq 'buffer cont))
|
|
|
|
(buffer-string)))))
|
2005-07-31 00:12:23 +00:00
|
|
|
((and filename
|
2004-09-04 13:13:48 +00:00
|
|
|
(not (equal (cdr (assq 'nofile cont)) "yes")))
|
|
|
|
(let ((coding-system-for-read mm-binary-coding-system))
|
2007-10-28 09:18:39 +00:00
|
|
|
(mm-insert-file-contents filename nil nil nil nil t))
|
|
|
|
(unless charset
|
|
|
|
(setq charset (mm-coding-system-to-mime-charset
|
|
|
|
(mm-find-buffer-file-coding-system
|
|
|
|
filename)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(t
|
2006-03-03 07:45:27 +00:00
|
|
|
(let ((contents (cdr (assq 'contents cont))))
|
|
|
|
(if (if (featurep 'xemacs)
|
|
|
|
(string-match "[^\000-\377]" contents)
|
|
|
|
(mm-multibyte-string-p contents))
|
|
|
|
(progn
|
|
|
|
(mm-enable-multibyte)
|
|
|
|
(insert contents)
|
2007-08-27 04:00:19 +00:00
|
|
|
(unless raw
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq charset (mm-encode-body charset))))
|
2006-03-03 07:45:27 +00:00
|
|
|
(insert contents)))))
|
2009-09-09 09:28:43 +00:00
|
|
|
(if (setq encoding (cdr (assq 'encoding cont)))
|
|
|
|
(setq encoding (intern (downcase encoding))))
|
|
|
|
(setq encoding (mm-encode-buffer type encoding)
|
2004-09-04 13:13:48 +00:00
|
|
|
coded (mm-string-as-multibyte (buffer-string))))
|
|
|
|
(mml-insert-mime-headers cont type charset encoding nil)
|
2007-08-27 04:00:19 +00:00
|
|
|
(insert "\n" coded))))
|
2004-09-04 13:13:48 +00:00
|
|
|
((eq (car cont) 'external)
|
|
|
|
(insert "Content-Type: message/external-body")
|
|
|
|
(let ((parameters (mml-parameter-string
|
|
|
|
cont '(expiration size permission)))
|
|
|
|
(name (cdr (assq 'name cont)))
|
|
|
|
(url (cdr (assq 'url cont))))
|
|
|
|
(when name
|
|
|
|
(setq name (mml-parse-file-name name))
|
|
|
|
(if (stringp name)
|
|
|
|
(mml-insert-parameter
|
|
|
|
(mail-header-encode-parameter "name" name)
|
|
|
|
"access-type=local-file")
|
2000-09-19 13:40:08 +00:00
|
|
|
(mml-insert-parameter
|
2004-09-04 13:13:48 +00:00
|
|
|
(mail-header-encode-parameter
|
|
|
|
"name" (file-name-nondirectory (nth 2 name)))
|
|
|
|
(mail-header-encode-parameter "site" (nth 1 name))
|
|
|
|
(mail-header-encode-parameter
|
|
|
|
"directory" (file-name-directory (nth 2 name))))
|
|
|
|
(mml-insert-parameter
|
|
|
|
(concat "access-type="
|
|
|
|
(if (member (nth 0 name) '("ftp@" "anonymous@"))
|
|
|
|
"anon-ftp"
|
|
|
|
"ftp")))))
|
|
|
|
(when url
|
2000-09-19 13:40:08 +00:00
|
|
|
(mml-insert-parameter
|
2004-09-04 13:13:48 +00:00
|
|
|
(mail-header-encode-parameter "url" url)
|
|
|
|
"access-type=url"))
|
|
|
|
(when parameters
|
|
|
|
(mml-insert-parameter-string
|
2005-07-31 00:12:23 +00:00
|
|
|
cont '(expiration size permission)))
|
|
|
|
(insert "\n\n")
|
|
|
|
(insert "Content-Type: "
|
|
|
|
(or (cdr (assq 'type cont))
|
2005-08-02 07:21:08 +00:00
|
|
|
(if name
|
|
|
|
(or (mm-default-file-encoding name)
|
|
|
|
"application/octet-stream")
|
|
|
|
"text/plain"))
|
2005-07-31 00:12:23 +00:00
|
|
|
"\n")
|
|
|
|
(insert "Content-ID: " (message-make-message-id) "\n")
|
|
|
|
(insert "Content-Transfer-Encoding: "
|
|
|
|
(or (cdr (assq 'encoding cont)) "binary"))
|
|
|
|
(insert "\n\n")
|
|
|
|
(insert (or (cdr (assq 'contents cont))))
|
|
|
|
(insert "\n")))
|
2004-09-04 13:13:48 +00:00
|
|
|
((eq (car cont) 'multipart)
|
|
|
|
(let* ((type (or (cdr (assq 'type cont)) "mixed"))
|
|
|
|
(mml-generate-default-type (if (equal type "digest")
|
|
|
|
"message/rfc822"
|
|
|
|
"text/plain"))
|
|
|
|
(handler (assoc type mml-generate-multipart-alist)))
|
|
|
|
(if handler
|
|
|
|
(funcall (cdr handler) cont)
|
|
|
|
;; No specific handler. Use default one.
|
|
|
|
(let ((mml-boundary (mml-compute-boundary cont)))
|
|
|
|
(insert (format "Content-Type: multipart/%s; boundary=\"%s\""
|
|
|
|
type mml-boundary)
|
|
|
|
(if (cdr (assq 'start cont))
|
|
|
|
(format "; start=\"%s\"\n" (cdr (assq 'start cont)))
|
|
|
|
"\n"))
|
|
|
|
(let ((cont cont) part)
|
|
|
|
(while (setq part (pop cont))
|
|
|
|
;; Skip `multipart' and attributes.
|
|
|
|
(when (and (consp part) (consp (cdr part)))
|
|
|
|
(insert "\n--" mml-boundary "\n")
|
2006-02-04 00:58:23 +00:00
|
|
|
(mml-generate-mime-1 part)
|
|
|
|
(goto-char (point-max)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert "\n--" mml-boundary "--\n")))))
|
|
|
|
(t
|
|
|
|
(error "Invalid element: %S" cont)))
|
|
|
|
;; handle sign & encrypt tags in a semi-smart way.
|
|
|
|
(let ((sign-item (assoc (cdr (assq 'sign cont)) mml-sign-alist))
|
|
|
|
(encrypt-item (assoc (cdr (assq 'encrypt cont))
|
|
|
|
mml-encrypt-alist))
|
|
|
|
sender recipients)
|
|
|
|
(when (or sign-item encrypt-item)
|
|
|
|
(when (setq sender (cdr (assq 'sender cont)))
|
|
|
|
(message-options-set 'mml-sender sender)
|
|
|
|
(message-options-set 'message-sender sender))
|
|
|
|
(if (setq recipients (cdr (assq 'recipients cont)))
|
|
|
|
(message-options-set 'message-recipients recipients))
|
2005-07-31 00:12:23 +00:00
|
|
|
(let ((style (mml-signencrypt-style
|
|
|
|
(first (or sign-item encrypt-item)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; check if: we're both signing & encrypting, both methods
|
|
|
|
;; are the same (why would they be different?!), and that
|
|
|
|
;; the signencrypt style allows for combined operation.
|
|
|
|
(if (and sign-item encrypt-item (equal (first sign-item)
|
|
|
|
(first encrypt-item))
|
|
|
|
(equal style 'combined))
|
|
|
|
(funcall (nth 1 encrypt-item) cont t)
|
|
|
|
;; otherwise, revert to the old behavior.
|
|
|
|
(when sign-item
|
|
|
|
(funcall (nth 1 sign-item) cont))
|
|
|
|
(when encrypt-item
|
|
|
|
(funcall (nth 1 encrypt-item) cont)))))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-compute-boundary (cont)
|
|
|
|
"Return a unique boundary that does not exist in CONT."
|
|
|
|
(let ((mml-boundary (funcall mml-boundary-function
|
|
|
|
(incf mml-multipart-number))))
|
|
|
|
;; This function tries again and again until it has found
|
|
|
|
;; a unique boundary.
|
|
|
|
(while (not (catch 'not-unique
|
|
|
|
(mml-compute-boundary-1 cont))))
|
|
|
|
mml-boundary))
|
|
|
|
|
|
|
|
(defun mml-compute-boundary-1 (cont)
|
|
|
|
(let (filename)
|
|
|
|
(cond
|
2010-05-06 03:27:20 +00:00
|
|
|
((member (car cont) '(part mml))
|
2000-09-19 13:40:08 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(cond
|
|
|
|
((cdr (assq 'buffer cont))
|
|
|
|
(insert-buffer-substring (cdr (assq 'buffer cont))))
|
|
|
|
((and (setq filename (cdr (assq 'filename cont)))
|
|
|
|
(not (equal (cdr (assq 'nofile cont)) "yes")))
|
2004-09-27 07:44:44 +00:00
|
|
|
(mm-insert-file-contents filename nil nil nil nil t))
|
2000-09-19 13:40:08 +00:00
|
|
|
(t
|
|
|
|
(insert (cdr (assq 'contents cont)))))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward (concat "^--" (regexp-quote mml-boundary))
|
|
|
|
nil t)
|
|
|
|
(setq mml-boundary (funcall mml-boundary-function
|
|
|
|
(incf mml-multipart-number)))
|
|
|
|
(throw 'not-unique nil))))
|
|
|
|
((eq (car cont) 'multipart)
|
2007-10-28 09:18:39 +00:00
|
|
|
(mapc 'mml-compute-boundary-1 (cddr cont))))
|
2000-09-19 13:40:08 +00:00
|
|
|
t))
|
|
|
|
|
|
|
|
(defun mml-make-boundary (number)
|
|
|
|
(concat (make-string (% number 60) ?=)
|
|
|
|
(if (> number 17)
|
|
|
|
(format "%x" number)
|
|
|
|
"")
|
|
|
|
mml-base-boundary))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun mml-content-disposition (type &optional filename)
|
|
|
|
"Return a default disposition name suitable to TYPE or FILENAME."
|
|
|
|
(let ((defs mml-content-disposition-alist)
|
|
|
|
disposition def types)
|
|
|
|
(while (and (not disposition) defs)
|
|
|
|
(setq def (pop defs))
|
|
|
|
(cond ((stringp (car def))
|
|
|
|
(when (and filename
|
|
|
|
(string-match (car def) filename))
|
|
|
|
(setq disposition (cdr def))))
|
|
|
|
((consp (cdr def))
|
|
|
|
(when (string= (car (setq types (split-string type "/")))
|
|
|
|
(car def))
|
|
|
|
(setq type (cadr types)
|
|
|
|
types (cdr def))
|
|
|
|
(while (and (not disposition) types)
|
|
|
|
(setq def (pop types))
|
|
|
|
(when (or (eq (car def) t) (string= type (car def)))
|
|
|
|
(setq disposition (cdr def))))))
|
|
|
|
(t
|
|
|
|
(when (or (eq (car def) t) (string= type (car def)))
|
|
|
|
(setq disposition (cdr def))))))
|
|
|
|
(or disposition "attachment")))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-insert-mime-headers (cont type charset encoding flowed)
|
|
|
|
(let (parameters id disposition description)
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq parameters
|
|
|
|
(mml-parameter-string
|
2004-09-04 13:13:48 +00:00
|
|
|
cont mml-content-type-parameters))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (or charset
|
|
|
|
parameters
|
2004-09-04 13:13:48 +00:00
|
|
|
flowed
|
|
|
|
(not (equal type mml-generate-default-type))
|
|
|
|
mml-insert-mime-headers-always)
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (consp charset)
|
|
|
|
(error
|
2004-09-04 13:13:48 +00:00
|
|
|
"Can't encode a part with several charsets"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert "Content-Type: " type)
|
|
|
|
(when charset
|
2006-02-08 04:35:58 +00:00
|
|
|
(mml-insert-parameter
|
|
|
|
(mail-header-encode-parameter "charset" (symbol-name charset))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(when flowed
|
2006-02-08 04:35:58 +00:00
|
|
|
(mml-insert-parameter "format=flowed"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when parameters
|
|
|
|
(mml-insert-parameter-string
|
2004-09-04 13:13:48 +00:00
|
|
|
cont mml-content-type-parameters))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert "\n"))
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (setq id (cdr (assq 'id cont)))
|
|
|
|
(insert "Content-ID: " id "\n"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(setq parameters
|
|
|
|
(mml-parameter-string
|
2004-09-04 13:13:48 +00:00
|
|
|
cont mml-content-disposition-parameters))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (or (setq disposition (cdr (assq 'disposition cont)))
|
|
|
|
parameters)
|
2007-10-28 09:18:39 +00:00
|
|
|
(insert "Content-Disposition: "
|
|
|
|
(or disposition
|
|
|
|
(mml-content-disposition type (cdr (assq 'filename cont)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when parameters
|
|
|
|
(mml-insert-parameter-string
|
2004-09-04 13:13:48 +00:00
|
|
|
cont mml-content-disposition-parameters))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert "\n"))
|
|
|
|
(unless (eq encoding '7bit)
|
|
|
|
(insert (format "Content-Transfer-Encoding: %s\n" encoding)))
|
|
|
|
(when (setq description (cdr (assq 'description cont)))
|
2006-02-08 04:35:58 +00:00
|
|
|
(insert "Content-Description: ")
|
|
|
|
(setq description (prog1
|
|
|
|
(point)
|
|
|
|
(insert description "\n")))
|
|
|
|
(mail-encode-encoded-word-region description (point)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-parameter-string (cont types)
|
|
|
|
(let ((string "")
|
|
|
|
value type)
|
|
|
|
(while (setq type (pop types))
|
|
|
|
(when (setq value (cdr (assq type cont)))
|
|
|
|
;; Strip directory component from the filename parameter.
|
|
|
|
(when (eq type 'filename)
|
|
|
|
(setq value (file-name-nondirectory value)))
|
|
|
|
(setq string (concat string "; "
|
|
|
|
(mail-header-encode-parameter
|
|
|
|
(symbol-name type) value)))))
|
|
|
|
(when (not (zerop (length string)))
|
|
|
|
string)))
|
|
|
|
|
|
|
|
(defun mml-insert-parameter-string (cont types)
|
|
|
|
(let (value type)
|
|
|
|
(while (setq type (pop types))
|
|
|
|
(when (setq value (cdr (assq type cont)))
|
|
|
|
;; Strip directory component from the filename parameter.
|
|
|
|
(when (eq type 'filename)
|
|
|
|
(setq value (file-name-nondirectory value)))
|
|
|
|
(mml-insert-parameter
|
|
|
|
(mail-header-encode-parameter
|
|
|
|
(symbol-name type) value))))))
|
|
|
|
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar ange-ftp-name-format)
|
|
|
|
(defvar efs-path-regexp)
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-parse-file-name (path)
|
|
|
|
(if (if (boundp 'efs-path-regexp)
|
|
|
|
(string-match efs-path-regexp path)
|
|
|
|
(if (boundp 'ange-ftp-name-format)
|
|
|
|
(string-match (car ange-ftp-name-format) path)))
|
|
|
|
(list (match-string 1 path) (match-string 2 path)
|
|
|
|
(substring path (1+ (match-end 2))))
|
|
|
|
path))
|
|
|
|
|
|
|
|
(defun mml-insert-buffer (buffer)
|
|
|
|
"Insert BUFFER at point and quote any MML markup."
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(insert-buffer-substring buffer)
|
|
|
|
(mml-quote-region (point-min) (point-max))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
|
|
|
;;;
|
|
|
|
;;; Transforming MIME to MML
|
|
|
|
;;;
|
|
|
|
|
2007-12-19 02:54:16 +00:00
|
|
|
;; message-narrow-to-head autoloads message.
|
|
|
|
(declare-function message-remove-header "message"
|
|
|
|
(header &optional is-regexp first reverse))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mime-to-mml (&optional handles)
|
|
|
|
"Translate the current buffer (which should be a message) into MML.
|
|
|
|
If HANDLES is non-nil, use it instead reparsing the buffer."
|
2000-09-19 13:40:08 +00:00
|
|
|
;; First decode the head.
|
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-head)
|
2005-02-19 13:24:16 +00:00
|
|
|
(let ((rfc2047-quote-decoded-words-containing-tspecials t))
|
|
|
|
(mail-decode-encoded-word-region (point-min) (point-max))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(unless handles
|
|
|
|
(setq handles (mm-dissect-buffer t)))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(search-forward "\n\n" nil t)
|
|
|
|
(delete-region (point) (point-max))
|
|
|
|
(if (stringp (car handles))
|
|
|
|
(mml-insert-mime handles)
|
|
|
|
(mml-insert-mime handles t))
|
|
|
|
(mm-destroy-parts handles)
|
2000-09-19 13:40:08 +00:00
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-head)
|
|
|
|
;; Remove them, they are confusing.
|
|
|
|
(message-remove-header "Content-Type")
|
|
|
|
(message-remove-header "MIME-Version")
|
2004-09-04 13:13:48 +00:00
|
|
|
(message-remove-header "Content-Disposition")
|
2000-09-19 13:40:08 +00:00
|
|
|
(message-remove-header "Content-Transfer-Encoding")))
|
|
|
|
|
2007-12-19 02:54:16 +00:00
|
|
|
(autoload 'message-encode-message-body "message")
|
|
|
|
(declare-function message-narrow-to-headers-or-head "message" ())
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-to-mime ()
|
|
|
|
"Translate the current buffer from MML to MIME."
|
2008-01-24 07:47:38 +00:00
|
|
|
;; `message-encode-message-body' will insert an encoded Content-Description
|
|
|
|
;; header in the message header if the body contains a single part
|
|
|
|
;; that is specified by a user with a MML tag containing a description
|
|
|
|
;; token. So, we encode the message header first to prevent the encoded
|
|
|
|
;; Content-Description header from being encoded again.
|
2000-09-19 13:40:08 +00:00
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-headers-or-head)
|
2004-09-04 13:13:48 +00:00
|
|
|
;; Skip past any From_ headers.
|
|
|
|
(while (looking-at "From ")
|
|
|
|
(forward-line 1))
|
2000-09-19 13:40:08 +00:00
|
|
|
(let ((mail-parse-charset message-default-charset))
|
2008-01-24 07:47:38 +00:00
|
|
|
(mail-encode-encoded-word-buffer)))
|
|
|
|
(message-encode-message-body))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-insert-mime (handle &optional no-markup)
|
|
|
|
(let (textp buffer mmlp)
|
|
|
|
;; Determine type and stuff.
|
|
|
|
(unless (stringp (car handle))
|
|
|
|
(unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
|
2010-05-03 00:41:45 +00:00
|
|
|
(with-current-buffer (setq buffer (mml-generate-new-buffer " *mml*"))
|
2009-03-03 02:32:23 +00:00
|
|
|
(if (eq (mail-content-type-get (mm-handle-type handle) 'charset)
|
|
|
|
'gnus-decoded)
|
|
|
|
;; A part that mm-uu dissected from a non-MIME message
|
|
|
|
;; because of `gnus-article-emulate-mime'.
|
|
|
|
(progn
|
|
|
|
(mm-enable-multibyte)
|
|
|
|
(insert-buffer-substring (mm-handle-buffer handle)))
|
|
|
|
(mm-insert-part handle 'no-cache)
|
|
|
|
(if (setq mmlp (equal (mm-handle-media-type handle)
|
|
|
|
"message/rfc822"))
|
|
|
|
(mime-to-mml))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(if mmlp
|
|
|
|
(mml-insert-mml-markup handle nil t t)
|
|
|
|
(unless (and no-markup
|
|
|
|
(equal (mm-handle-media-type handle) "text/plain"))
|
|
|
|
(mml-insert-mml-markup handle buffer textp)))
|
|
|
|
(cond
|
2003-02-04 13:24:35 +00:00
|
|
|
(mmlp
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert-buffer-substring buffer)
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-max))
|
|
|
|
(insert "<#/mml>\n"))
|
|
|
|
((stringp (car handle))
|
2007-10-28 09:18:39 +00:00
|
|
|
(mapc 'mml-insert-mime (cdr handle))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert "<#/multipart>\n"))
|
|
|
|
(textp
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((charset (mail-content-type-get
|
|
|
|
(mm-handle-type handle) 'charset))
|
|
|
|
(start (point)))
|
|
|
|
(if (eq charset 'gnus-decoded)
|
|
|
|
(mm-insert-part handle)
|
|
|
|
(insert (mm-decode-string (mm-get-part handle) charset)))
|
|
|
|
(mml-quote-region start (point)))
|
2000-09-19 13:40:08 +00:00
|
|
|
(goto-char (point-max)))
|
|
|
|
(t
|
|
|
|
(insert "<#/part>\n")))))
|
|
|
|
|
|
|
|
(defun mml-insert-mml-markup (handle &optional buffer nofile mmlp)
|
|
|
|
"Take a MIME handle and insert an MML tag."
|
|
|
|
(if (stringp (car handle))
|
2004-09-04 13:13:48 +00:00
|
|
|
(progn
|
|
|
|
(insert "<#multipart type=" (mm-handle-media-subtype handle))
|
|
|
|
(let ((start (mm-handle-multipart-ctl-parameter handle 'start)))
|
|
|
|
(when start
|
|
|
|
(insert " start=\"" start "\"")))
|
|
|
|
(insert ">\n"))
|
2000-09-19 13:40:08 +00:00
|
|
|
(if mmlp
|
|
|
|
(insert "<#mml type=" (mm-handle-media-type handle))
|
|
|
|
(insert "<#part type=" (mm-handle-media-type handle)))
|
|
|
|
(dolist (elem (append (cdr (mm-handle-type handle))
|
|
|
|
(cdr (mm-handle-disposition handle))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(unless (symbolp (cdr elem))
|
|
|
|
(insert " " (symbol-name (car elem)) "=\"" (cdr elem) "\"")))
|
|
|
|
(when (mm-handle-id handle)
|
|
|
|
(insert " id=\"" (mm-handle-id handle) "\""))
|
2000-09-19 13:40:08 +00:00
|
|
|
(when (mm-handle-disposition handle)
|
|
|
|
(insert " disposition=" (car (mm-handle-disposition handle))))
|
|
|
|
(when buffer
|
|
|
|
(insert " buffer=\"" (buffer-name buffer) "\""))
|
|
|
|
(when nofile
|
|
|
|
(insert " nofile=yes"))
|
|
|
|
(when (mm-handle-description handle)
|
|
|
|
(insert " description=\"" (mm-handle-description handle) "\""))
|
|
|
|
(insert ">\n")))
|
|
|
|
|
|
|
|
(defun mml-insert-parameter (&rest parameters)
|
|
|
|
"Insert PARAMETERS in a nice way."
|
2006-02-08 04:35:58 +00:00
|
|
|
(let (start end)
|
|
|
|
(dolist (param parameters)
|
|
|
|
(insert ";")
|
|
|
|
(setq start (point))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert " " param)
|
2006-02-08 04:35:58 +00:00
|
|
|
(setq end (point))
|
|
|
|
(goto-char start)
|
|
|
|
(end-of-line)
|
|
|
|
(if (> (current-column) 76)
|
|
|
|
(progn
|
|
|
|
(goto-char start)
|
|
|
|
(insert "\n")
|
|
|
|
(goto-char (1+ end)))
|
|
|
|
(goto-char end)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;;
|
|
|
|
;;; Mode for inserting and editing MML forms
|
|
|
|
;;;
|
|
|
|
|
|
|
|
(defvar mml-mode-map
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((sign (make-sparse-keymap))
|
|
|
|
(encrypt (make-sparse-keymap))
|
|
|
|
(signpart (make-sparse-keymap))
|
|
|
|
(encryptpart (make-sparse-keymap))
|
|
|
|
(map (make-sparse-keymap))
|
2000-09-19 13:40:08 +00:00
|
|
|
(main (make-sparse-keymap)))
|
2006-04-26 21:58:05 +00:00
|
|
|
(define-key map "\C-s" 'mml-secure-message-sign)
|
|
|
|
(define-key map "\C-c" 'mml-secure-message-encrypt)
|
|
|
|
(define-key map "\C-e" 'mml-secure-message-sign-encrypt)
|
|
|
|
(define-key map "\C-p\C-s" 'mml-secure-sign)
|
|
|
|
(define-key map "\C-p\C-c" 'mml-secure-encrypt)
|
2004-09-04 13:13:48 +00:00
|
|
|
(define-key sign "p" 'mml-secure-message-sign-pgpmime)
|
|
|
|
(define-key sign "o" 'mml-secure-message-sign-pgp)
|
|
|
|
(define-key sign "s" 'mml-secure-message-sign-smime)
|
|
|
|
(define-key signpart "p" 'mml-secure-sign-pgpmime)
|
|
|
|
(define-key signpart "o" 'mml-secure-sign-pgp)
|
|
|
|
(define-key signpart "s" 'mml-secure-sign-smime)
|
|
|
|
(define-key encrypt "p" 'mml-secure-message-encrypt-pgpmime)
|
|
|
|
(define-key encrypt "o" 'mml-secure-message-encrypt-pgp)
|
|
|
|
(define-key encrypt "s" 'mml-secure-message-encrypt-smime)
|
|
|
|
(define-key encryptpart "p" 'mml-secure-encrypt-pgpmime)
|
|
|
|
(define-key encryptpart "o" 'mml-secure-encrypt-pgp)
|
|
|
|
(define-key encryptpart "s" 'mml-secure-encrypt-smime)
|
|
|
|
(define-key map "\C-n" 'mml-unsecure-message)
|
2000-09-19 13:40:08 +00:00
|
|
|
(define-key map "f" 'mml-attach-file)
|
|
|
|
(define-key map "b" 'mml-attach-buffer)
|
|
|
|
(define-key map "e" 'mml-attach-external)
|
|
|
|
(define-key map "q" 'mml-quote-region)
|
|
|
|
(define-key map "m" 'mml-insert-multipart)
|
|
|
|
(define-key map "p" 'mml-insert-part)
|
|
|
|
(define-key map "v" 'mml-validate)
|
|
|
|
(define-key map "P" 'mml-preview)
|
2004-09-04 13:13:48 +00:00
|
|
|
(define-key map "s" sign)
|
|
|
|
(define-key map "S" signpart)
|
|
|
|
(define-key map "c" encrypt)
|
|
|
|
(define-key map "C" encryptpart)
|
2000-09-19 13:40:08 +00:00
|
|
|
;;(define-key map "n" 'mml-narrow-to-part)
|
2004-09-04 13:13:48 +00:00
|
|
|
;; `M-m' conflicts with `back-to-indentation'.
|
|
|
|
;; (define-key main "\M-m" map)
|
|
|
|
(define-key main "\C-c\C-m" map)
|
2000-09-19 13:40:08 +00:00
|
|
|
main))
|
|
|
|
|
|
|
|
(easy-menu-define
|
2001-11-06 04:29:38 +00:00
|
|
|
mml-menu mml-mode-map ""
|
2004-09-04 13:13:48 +00:00
|
|
|
`("Attachments"
|
|
|
|
["Attach File..." mml-attach-file
|
|
|
|
,@(if (featurep 'xemacs) '(t)
|
|
|
|
'(:help "Attach a file at point"))]
|
2006-04-26 21:58:05 +00:00
|
|
|
["Attach Buffer..." mml-attach-buffer
|
|
|
|
,@(if (featurep 'xemacs) '(t)
|
2008-03-10 00:50:22 +00:00
|
|
|
'(:help "Attach a buffer to the outgoing message"))]
|
2006-04-26 21:58:05 +00:00
|
|
|
["Attach External..." mml-attach-external
|
|
|
|
,@(if (featurep 'xemacs) '(t)
|
2008-03-10 00:50:22 +00:00
|
|
|
'(:help "Attach reference to an external file"))]
|
2008-03-29 19:54:11 +00:00
|
|
|
;; FIXME: Is it possible to do this without using
|
|
|
|
;; `gnus-gcc-externalize-attachments'?
|
|
|
|
["Externalize Attachments"
|
|
|
|
(lambda ()
|
|
|
|
(interactive)
|
|
|
|
(if (not (and (boundp 'gnus-gcc-externalize-attachments)
|
|
|
|
(memq gnus-gcc-externalize-attachments
|
|
|
|
'(all t nil))))
|
|
|
|
;; Stupid workaround for XEmacs not honoring :visible.
|
|
|
|
(message "Can't handle this value of `gnus-gcc-externalize-attachments'")
|
|
|
|
(setq gnus-gcc-externalize-attachments
|
|
|
|
(not gnus-gcc-externalize-attachments))
|
|
|
|
(message "gnus-gcc-externalize-attachments is `%s'."
|
|
|
|
gnus-gcc-externalize-attachments)))
|
|
|
|
;; XEmacs barfs on :visible.
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:visible (and (boundp 'gnus-gcc-externalize-attachments)
|
|
|
|
(memq gnus-gcc-externalize-attachments
|
|
|
|
'(all t nil)))))
|
|
|
|
:style toggle
|
|
|
|
:selected gnus-gcc-externalize-attachments
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:help "Save attachments as external parts in Gcc copies"))]
|
2008-03-10 00:50:22 +00:00
|
|
|
"----"
|
2006-04-26 21:58:05 +00:00
|
|
|
;;
|
|
|
|
("Change Security Method"
|
|
|
|
["PGP/MIME"
|
|
|
|
(lambda () (interactive) (setq mml-secure-method "pgpmime"))
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:help "Set Security Method to PGP/MIME"))
|
|
|
|
:style radio
|
|
|
|
:selected (equal mml-secure-method "pgpmime") ]
|
|
|
|
["S/MIME"
|
|
|
|
(lambda () (interactive) (setq mml-secure-method "smime"))
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:help "Set Security Method to S/MIME"))
|
|
|
|
:style radio
|
|
|
|
:selected (equal mml-secure-method "smime") ]
|
|
|
|
["Inline PGP"
|
|
|
|
(lambda () (interactive) (setq mml-secure-method "pgp"))
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:help "Set Security Method to inline PGP"))
|
|
|
|
:style radio
|
|
|
|
:selected (equal mml-secure-method "pgp") ] )
|
|
|
|
;;
|
|
|
|
["Sign Message" mml-secure-message-sign t]
|
|
|
|
["Encrypt Message" mml-secure-message-encrypt t]
|
|
|
|
["Sign and Encrypt Message" mml-secure-message-sign-encrypt t]
|
|
|
|
["Encrypt/Sign off" mml-unsecure-message
|
|
|
|
,@(if (featurep 'xemacs) '(t)
|
|
|
|
'(:help "Don't Encrypt/Sign Message"))]
|
2008-03-10 00:50:22 +00:00
|
|
|
;; Do we have separate encrypt and encrypt/sign commands for parts?
|
|
|
|
["Sign Part" mml-secure-sign t]
|
|
|
|
["Encrypt Part" mml-secure-encrypt t]
|
|
|
|
"----"
|
2006-04-26 21:58:05 +00:00
|
|
|
;; Maybe we could remove these, because people who write MML most probably
|
|
|
|
;; don't use the menu:
|
|
|
|
["Insert Part..." mml-insert-part
|
|
|
|
:active (message-in-body-p)]
|
|
|
|
["Insert Multipart..." mml-insert-multipart
|
|
|
|
:active (message-in-body-p)]
|
|
|
|
;;
|
2001-11-06 04:29:38 +00:00
|
|
|
;;["Narrow" mml-narrow-to-part t]
|
2006-04-26 21:58:05 +00:00
|
|
|
["Quote MML in region" mml-quote-region
|
|
|
|
:active (message-mark-active-p)
|
|
|
|
,@(if (featurep 'xemacs) nil
|
|
|
|
'(:help "Quote MML tags in region"))]
|
2004-09-04 13:13:48 +00:00
|
|
|
["Validate MML" mml-validate t]
|
2006-01-25 06:47:24 +00:00
|
|
|
["Preview" mml-preview t]
|
|
|
|
"----"
|
|
|
|
["Emacs MIME manual" (lambda () (interactive) (message-info 4))
|
|
|
|
,@(if (featurep 'xemacs) '(t)
|
|
|
|
'(:help "Display the Emacs MIME manual"))]
|
2008-03-29 19:54:11 +00:00
|
|
|
["PGG manual" (lambda () (interactive) (message-info mml2015-use))
|
|
|
|
;; XEmacs barfs on :visible.
|
|
|
|
,@(if (featurep 'xemacs) nil
|
2008-09-30 23:11:17 +00:00
|
|
|
'(:visible (and (boundp 'mml2015-use) (equal mml2015-use 'pgg))))
|
2008-03-29 19:54:11 +00:00
|
|
|
,@(if (featurep 'xemacs) '(t)
|
|
|
|
'(:help "Display the PGG manual"))]
|
2008-09-30 23:11:17 +00:00
|
|
|
["EasyPG manual" (lambda () (interactive) (require 'mml2015) (message-info mml2015-use))
|
2008-03-29 19:54:11 +00:00
|
|
|
;; XEmacs barfs on :visible.
|
|
|
|
,@(if (featurep 'xemacs) nil
|
2008-09-30 23:11:17 +00:00
|
|
|
'(:visible (and (boundp 'mml2015-use) (equal mml2015-use 'epg))))
|
2006-01-25 06:47:24 +00:00
|
|
|
,@(if (featurep 'xemacs) '(t)
|
2008-03-29 19:54:11 +00:00
|
|
|
'(:help "Display the EasyPG manual"))]))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2010-05-03 00:41:45 +00:00
|
|
|
(define-minor-mode mml-mode
|
2000-09-19 13:40:08 +00:00
|
|
|
"Minor mode for editing MML.
|
2004-09-04 13:13:48 +00:00
|
|
|
MML is the MIME Meta Language, a minor mode for composing MIME articles.
|
|
|
|
See Info node `(emacs-mime)Composing'.
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
\\{mml-mode-map}"
|
2010-05-03 00:41:45 +00:00
|
|
|
:lighter " MML" :keymap mml-mode-map
|
|
|
|
(when mml-mode
|
2004-09-04 13:13:48 +00:00
|
|
|
(easy-menu-add mml-menu mml-mode-map)
|
2006-04-26 21:58:05 +00:00
|
|
|
(when (boundp 'dnd-protocol-alist)
|
|
|
|
(set (make-local-variable 'dnd-protocol-alist)
|
2010-05-03 00:41:45 +00:00
|
|
|
(append mml-dnd-protocol-alist dnd-protocol-alist)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
;;;
|
|
|
|
;;; Helper functions for reading MIME stuff from the minibuffer and
|
|
|
|
;;; inserting stuff to the buffer.
|
|
|
|
;;;
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom mml-default-directory mm-default-directory
|
|
|
|
"The default directory where mml will find files.
|
|
|
|
If not set, `default-directory' will be used."
|
|
|
|
:type '(choice directory (const :tag "Default" nil))
|
2008-02-29 04:03:49 +00:00
|
|
|
:version "23.1" ;; No Gnus
|
2007-10-28 09:18:39 +00:00
|
|
|
:group 'message)
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-minibuffer-read-file (prompt)
|
2004-09-04 13:13:48 +00:00
|
|
|
(let* ((completion-ignored-extensions nil)
|
2007-10-28 09:18:39 +00:00
|
|
|
(file (read-file-name prompt
|
|
|
|
(or mml-default-directory default-directory)
|
|
|
|
nil t)))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; Prevent some common errors. This is inspired by similar code in
|
2000-09-19 13:40:08 +00:00
|
|
|
;; VM.
|
|
|
|
(when (file-directory-p file)
|
|
|
|
(error "%s is a directory, cannot attach" file))
|
|
|
|
(unless (file-exists-p file)
|
|
|
|
(error "No such file: %s" file))
|
|
|
|
(unless (file-readable-p file)
|
|
|
|
(error "Permission denied: %s" file))
|
|
|
|
file))
|
|
|
|
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
(declare-function mailcap-parse-mimetypes "mailcap" (&optional path force))
|
|
|
|
(declare-function mailcap-mime-types "mailcap" ())
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-minibuffer-read-type (name &optional default)
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
(require 'mailcap)
|
2000-09-19 13:40:08 +00:00
|
|
|
(mailcap-parse-mimetypes)
|
|
|
|
(let* ((default (or default
|
|
|
|
(mm-default-file-encoding name)
|
|
|
|
;; Perhaps here we should check what the file
|
|
|
|
;; looks like, and offer text/plain if it looks
|
|
|
|
;; like text/plain.
|
|
|
|
"application/octet-stream"))
|
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
2010-09-30 08:39:23 +00:00
|
|
|
(string (gnus-completing-read
|
|
|
|
"Content type"
|
|
|
|
(mailcap-mime-types)
|
|
|
|
nil nil nil default)))
|
2000-09-19 13:40:08 +00:00
|
|
|
(if (not (equal string ""))
|
|
|
|
string
|
|
|
|
default)))
|
|
|
|
|
|
|
|
(defun mml-minibuffer-read-description ()
|
|
|
|
(let ((description (read-string "One line description: ")))
|
|
|
|
(when (string-match "\\`[ \t]*\\'" description)
|
|
|
|
(setq description nil))
|
|
|
|
description))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun mml-minibuffer-read-disposition (type &optional default filename)
|
|
|
|
(unless default
|
|
|
|
(setq default (mml-content-disposition type filename)))
|
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
2010-09-30 08:39:23 +00:00
|
|
|
(let ((disposition (gnus-completing-read
|
|
|
|
"Disposition"
|
|
|
|
'("attachment" "inline")
|
|
|
|
t nil nil default)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (not (equal disposition ""))
|
|
|
|
disposition
|
|
|
|
default)))
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-quote-region (beg end)
|
|
|
|
"Quote the MML tags in the region."
|
|
|
|
(interactive "r")
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
;; Temporarily narrow the region to defend from changes
|
|
|
|
;; invalidating END.
|
|
|
|
(narrow-to-region beg end)
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; Quote parts.
|
|
|
|
(while (re-search-forward
|
|
|
|
"<#!*/?\\(multipart\\|part\\|external\\|mml\\)" nil t)
|
|
|
|
;; Insert ! after the #.
|
|
|
|
(goto-char (+ (match-beginning 0) 2))
|
|
|
|
(insert "!")))))
|
|
|
|
|
|
|
|
(defun mml-insert-tag (name &rest plist)
|
|
|
|
"Insert an MML tag described by NAME and PLIST."
|
|
|
|
(when (symbolp name)
|
|
|
|
(setq name (symbol-name name)))
|
|
|
|
(insert "<#" name)
|
|
|
|
(while plist
|
|
|
|
(let ((key (pop plist))
|
|
|
|
(value (pop plist)))
|
|
|
|
(when value
|
|
|
|
;; Quote VALUE if it contains suspicious characters.
|
|
|
|
(when (string-match "[\"'\\~/*;() \t\n]" value)
|
2004-09-04 13:13:48 +00:00
|
|
|
(setq value (with-output-to-string
|
|
|
|
(let (print-escape-nonascii)
|
|
|
|
(prin1 value)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
(insert (format " %s=%s" key value)))))
|
|
|
|
(insert ">\n"))
|
|
|
|
|
|
|
|
(defun mml-insert-empty-tag (name &rest plist)
|
|
|
|
"Insert an empty MML tag described by NAME and PLIST."
|
|
|
|
(when (symbolp name)
|
|
|
|
(setq name (symbol-name name)))
|
|
|
|
(apply #'mml-insert-tag name plist)
|
|
|
|
(insert "<#/" name ">\n"))
|
|
|
|
|
|
|
|
;;; Attachment functions.
|
|
|
|
|
2006-04-26 21:58:05 +00:00
|
|
|
(defcustom mml-dnd-protocol-alist
|
|
|
|
'(("^file:///" . mml-dnd-attach-file)
|
|
|
|
("^file://" . dnd-open-file)
|
|
|
|
("^file:" . mml-dnd-attach-file))
|
|
|
|
"The functions to call when a drop in `mml-mode' is made.
|
|
|
|
See `dnd-protocol-alist' for more information. When nil, behave
|
|
|
|
as in other buffers."
|
|
|
|
:type '(choice (repeat (cons (regexp) (function)))
|
|
|
|
(const :tag "Behave as in other buffers" nil))
|
|
|
|
:version "22.1" ;; Gnus 5.10.9
|
|
|
|
:group 'message)
|
|
|
|
|
|
|
|
(defcustom mml-dnd-attach-options nil
|
|
|
|
"Which options should be queried when attaching a file via drag and drop.
|
|
|
|
|
|
|
|
If it is a list, valid members are `type', `description' and
|
|
|
|
`disposition'. `disposition' implies `type'. If it is nil,
|
|
|
|
don't ask for options. If it is t, ask the user whether or not
|
|
|
|
to specify options."
|
|
|
|
:type '(choice
|
2008-03-10 00:50:22 +00:00
|
|
|
(const :tag "None" nil)
|
2006-04-26 21:58:05 +00:00
|
|
|
(const :tag "Query" t)
|
|
|
|
(list :value (type description disposition)
|
|
|
|
(set :inline t
|
|
|
|
(const type)
|
|
|
|
(const description)
|
|
|
|
(const disposition))))
|
|
|
|
:version "22.1" ;; Gnus 5.10.9
|
|
|
|
:group 'message)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-attach-file (file &optional type description disposition)
|
2000-09-19 13:40:08 +00:00
|
|
|
"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]'.
|
|
|
|
|
2006-01-25 06:47:24 +00:00
|
|
|
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. The DISPOSITION
|
|
|
|
specifies how the attachment is intended to be displayed. It can
|
|
|
|
be either \"inline\" (displayed automatically within the message
|
|
|
|
body) or \"attachment\" (separate from the body)."
|
2000-09-19 13:40:08 +00:00
|
|
|
(interactive
|
|
|
|
(let* ((file (mml-minibuffer-read-file "Attach file: "))
|
|
|
|
(type (mml-minibuffer-read-type file))
|
2004-09-04 13:13:48 +00:00
|
|
|
(description (mml-minibuffer-read-description))
|
2007-10-28 09:18:39 +00:00
|
|
|
(disposition (mml-minibuffer-read-disposition type nil file)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(list file type description disposition)))
|
2009-09-01 07:59:50 +00:00
|
|
|
;; Don't move point if this command is invoked inside the message header.
|
|
|
|
(let ((head (unless (message-in-body-p)
|
|
|
|
(prog1
|
|
|
|
(point)
|
|
|
|
(goto-char (point-max))))))
|
|
|
|
(mml-insert-empty-tag 'part
|
|
|
|
'type type
|
|
|
|
;; icicles redefines read-file-name and returns a
|
|
|
|
;; string w/ text properties :-/
|
|
|
|
'filename (mm-substring-no-properties file)
|
|
|
|
'disposition (or disposition "attachment")
|
|
|
|
'description description)
|
|
|
|
(when head
|
|
|
|
(unless (prog1
|
|
|
|
(pos-visible-in-window-p)
|
|
|
|
(goto-char head))
|
|
|
|
(message "The file \"%s\" has been attached at the end of the message"
|
|
|
|
(file-name-nondirectory file))))))
|
2006-04-26 21:58:05 +00:00
|
|
|
|
|
|
|
(defun mml-dnd-attach-file (uri action)
|
|
|
|
"Attach a drag and drop file.
|
|
|
|
|
|
|
|
Ask for type, description or disposition according to
|
|
|
|
`mml-dnd-attach-options'."
|
|
|
|
(let ((file (dnd-get-local-file-name uri t)))
|
|
|
|
(when (and file (file-regular-p file))
|
|
|
|
(let ((mml-dnd-attach-options mml-dnd-attach-options)
|
|
|
|
type description disposition)
|
|
|
|
(setq mml-dnd-attach-options
|
|
|
|
(when (and (eq mml-dnd-attach-options t)
|
|
|
|
(not
|
|
|
|
(y-or-n-p
|
|
|
|
"Use default type, disposition and description? ")))
|
|
|
|
'(type description disposition)))
|
|
|
|
(when (or (memq 'type mml-dnd-attach-options)
|
|
|
|
(memq 'disposition mml-dnd-attach-options))
|
|
|
|
(setq type (mml-minibuffer-read-type file)))
|
|
|
|
(when (memq 'description mml-dnd-attach-options)
|
|
|
|
(setq description (mml-minibuffer-read-description)))
|
|
|
|
(when (memq 'disposition mml-dnd-attach-options)
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq disposition (mml-minibuffer-read-disposition type nil file)))
|
2006-04-26 21:58:05 +00:00
|
|
|
(mml-attach-file file type description disposition)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2008-05-18 22:43:12 +00:00
|
|
|
(defun mml-attach-buffer (buffer &optional type description disposition)
|
2000-09-19 13:40:08 +00:00
|
|
|
"Attach a buffer to the outgoing MIME message.
|
2008-05-18 22:43:12 +00:00
|
|
|
BUFFER is the name of the buffer to attach. See
|
|
|
|
`mml-attach-file' for details of operation."
|
2000-09-19 13:40:08 +00:00
|
|
|
(interactive
|
|
|
|
(let* ((buffer (read-buffer "Attach buffer: "))
|
|
|
|
(type (mml-minibuffer-read-type buffer "text/plain"))
|
2008-05-18 22:43:12 +00:00
|
|
|
(description (mml-minibuffer-read-description))
|
|
|
|
(disposition (mml-minibuffer-read-disposition type nil)))
|
|
|
|
(list buffer type description disposition)))
|
2009-09-01 07:59:50 +00:00
|
|
|
;; Don't move point if this command is invoked inside the message header.
|
|
|
|
(let ((head (unless (message-in-body-p)
|
|
|
|
(prog1
|
|
|
|
(point)
|
|
|
|
(goto-char (point-max))))))
|
|
|
|
(mml-insert-empty-tag 'part 'type type 'buffer buffer
|
|
|
|
'disposition disposition
|
|
|
|
'description description)
|
|
|
|
(when head
|
|
|
|
(unless (prog1
|
|
|
|
(pos-visible-in-window-p)
|
|
|
|
(goto-char head))
|
|
|
|
(message
|
|
|
|
"The buffer \"%s\" has been attached at the end of the message"
|
|
|
|
buffer)))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-attach-external (file &optional type description)
|
|
|
|
"Attach an external file into the buffer.
|
|
|
|
FILE is an ange-ftp/efs specification of the part location.
|
|
|
|
TYPE is the MIME type to use."
|
|
|
|
(interactive
|
|
|
|
(let* ((file (mml-minibuffer-read-file "Attach external file: "))
|
|
|
|
(type (mml-minibuffer-read-type file))
|
|
|
|
(description (mml-minibuffer-read-description)))
|
|
|
|
(list file type description)))
|
2009-09-01 07:59:50 +00:00
|
|
|
;; Don't move point if this command is invoked inside the message header.
|
|
|
|
(let ((head (unless (message-in-body-p)
|
|
|
|
(prog1
|
|
|
|
(point)
|
|
|
|
(goto-char (point-max))))))
|
|
|
|
(mml-insert-empty-tag 'external 'type type 'name file
|
|
|
|
'disposition "attachment" 'description description)
|
|
|
|
(when head
|
|
|
|
(unless (prog1
|
|
|
|
(pos-visible-in-window-p)
|
|
|
|
(goto-char head))
|
|
|
|
(message "The file \"%s\" has been attached at the end of the message"
|
|
|
|
(file-name-nondirectory file))))))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-insert-multipart (&optional type)
|
2009-09-10 00:12:07 +00:00
|
|
|
(interactive (if (message-in-body-p)
|
Merge changes made in Gnus trunk.
nndraft.el (nndraft-request-expire-articles): Use the group name instead if "nndraft".
gnus.texi (Using IMAP): Remove the @acronyms from the headings.
nnregistry.el: Added.
nnimap.el (nnimap-insert-partial-structure): Be way more permissive when interpreting the structures.
GNUS-NEWS: Minor error in GNUS-NEWS - password-cache.el.
nnimap.el (nnimap-request-accept-article): Add \r\n to the lines to make this work with Cyrus.
gnus-registry.el: Don't prompt on load, which makes it impossible to build Gnus.
gnus-gravatar.el: Add gnus-gravatar-properties.
gnus-agent.el, gnus-art.el, gnus-bookmark.el, gnus-dired.el, gnus-group.el,\
gnus-int.el, gnus-msg.el, gnus-registry.el, gnus-score.el, gnus-srvr.el,\
gnus-sum.el, gnus-topic.el, gnus-util.el, gnus.el, mm-decode.el, mm-util.el,\
mm-view.el, mml-smime.el, mml.el, nnmairix.el, nnrss.el, smime.el:\
Introduce gnus-completing-read.
gnus-util.el: Make completing-read function configurable.
gnus-util.el: Add requires and fix history for iswitchb.
webmail.el: Remove netscape/my-deja, since they no longer exist.
gnus.el (gnus-local-domain): Declare variable obsolete.
nnimap.el (nnimap-insert-partial-structure): Get the type from the correct slot, too.
pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable.
nnimap.el (nnimap-open-connection): Revert the auto-network->starttls code.
nnimap.el (nnimap-request-set-mark): Erase the buffer before issuing commands.
nnimap.el (nnimap-split-rule): Mark as obsolete.
gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a symbol.
nnimap.el (nnimap-split-incoming-mail): Allow `default' as nnimap-split-methods value.
nnimap.el (nnimap-request-article): Downcase the NILs so that they are nil.
nndoc.el (nndoc-retrieve-groups): New function.
gnus.texi: Fix Gravatar documentation.
2010-09-30 08:39:23 +00:00
|
|
|
(list (gnus-completing-read "Multipart type"
|
|
|
|
'("mixed" "alternative"
|
|
|
|
"digest" "parallel"
|
|
|
|
"signed" "encrypted")
|
|
|
|
nil "mixed"))
|
2009-09-10 00:12:07 +00:00
|
|
|
(error "Use this command in the message body")))
|
2000-09-19 13:40:08 +00:00
|
|
|
(or type
|
|
|
|
(setq type "mixed"))
|
|
|
|
(mml-insert-empty-tag "multipart" 'type type)
|
|
|
|
(forward-line -1))
|
|
|
|
|
|
|
|
(defun mml-insert-part (&optional type)
|
2009-09-10 00:12:07 +00:00
|
|
|
(interactive (if (message-in-body-p)
|
|
|
|
(list (mml-minibuffer-read-type ""))
|
|
|
|
(error "Use this command in the message body")))
|
|
|
|
(mml-insert-tag 'part 'type type 'disposition "inline"))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
2007-12-19 02:54:16 +00:00
|
|
|
(declare-function message-subscribed-p "message" ())
|
|
|
|
(declare-function message-make-mail-followup-to "message"
|
|
|
|
(&optional only-show-subscribed))
|
|
|
|
(declare-function message-position-on-field "message" (header &rest afters))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-preview-insert-mail-followup-to ()
|
|
|
|
"Insert a Mail-Followup-To header before previewing an article.
|
|
|
|
Should be adopted if code in `message-send-mail' is changed."
|
|
|
|
(when (and (message-mail-p)
|
|
|
|
(message-subscribed-p)
|
|
|
|
(not (mail-fetch-field "mail-followup-to"))
|
|
|
|
(message-make-mail-followup-to))
|
|
|
|
(message-position-on-field "Mail-Followup-To" "X-Draft-From")
|
|
|
|
(insert (message-make-mail-followup-to))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defvar mml-preview-buffer nil)
|
|
|
|
|
2007-12-11 05:28:59 +00:00
|
|
|
(autoload 'gnus-make-hashtable "gnus-util")
|
|
|
|
(autoload 'widget-button-press "wid-edit" nil t)
|
|
|
|
(declare-function widget-event-point "wid-edit" (event))
|
|
|
|
;; If gnus-buffer-configuration is bound this is loaded.
|
|
|
|
(declare-function gnus-configure-windows "gnus-win" (setting &optional force))
|
2007-12-19 02:54:16 +00:00
|
|
|
;; Called after message-mail-p, which autoloads message.
|
|
|
|
(declare-function message-news-p "message" ())
|
|
|
|
(declare-function message-options-set-recipient "message" ())
|
|
|
|
(declare-function message-generate-headers "message" (headers))
|
|
|
|
(declare-function message-sort-headers "message" ())
|
2007-12-11 05:28:59 +00:00
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(defun mml-preview (&optional raw)
|
|
|
|
"Display current buffer with Gnus, in a new buffer.
|
2007-10-28 09:18:39 +00:00
|
|
|
If RAW, display a raw encoded MIME message.
|
|
|
|
|
|
|
|
The window layout for the preview buffer is controled by the variables
|
|
|
|
`special-display-buffer-names', `special-display-regexps', or
|
|
|
|
`gnus-buffer-configuration' (the first match made will be used),
|
|
|
|
or the `pop-to-buffer' function."
|
2000-09-19 13:40:08 +00:00
|
|
|
(interactive "P")
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq mml-preview-buffer (generate-new-buffer
|
|
|
|
(concat (if raw "*Raw MIME preview of "
|
|
|
|
"*MIME preview of ") (buffer-name))))
|
Stop message.el from loading about 40 libraries it doesn't always need.
The general approach is to autoload rather than require, and to
require in the specific functions rather than the file. (Bug#5642)
* url/url.el: Move mailcap require earlier in the file.
* gnus/gmm-utils.el: Don't require wid-edit.
(widget-create-child-value, widget-convert, widget-default-get):
Autoload.
* gnus/gnus-util.el: Don't require time-date, netrc.
(message-fetch-field, gnus-group-name-decode): Declare rather than
autoloading.
(gnus-fetch-field): Require message.
(gnus-decode-newsgroups): Require gnus-group.
* gnus/ietf-drums.el: Don't require time-date.
* gnus/message.el: Don't require hashcash, canlock, ecomplete.
Do require mail-utils. Require nnheader only when compiling.
(smtpmail-default-smtp-server): Remove declaration.
(message-send-mail-function): Check smtpmail-default-smtp-server
is bound rather than requiring smtpmail.
(message-auto-save-directory, message-insert-signature): Use
expand-file-name rather than nnheader-concat.
(nnheader-insert-file-contents): Autoload.
(hashcash-wait-async): Declare.
(message-send-mail): Only call gnus-setup-posting-charset if
gnus-group-posting-charset-alist is bound. Require hashcash if needed.
(message-send-mail-with-sendmail): Require sendmail.
(canlock-password, canlock-password-for-verify): Declare.
(message-canlock-password): Require canlock.
(nnheader-get-report): Autoload.
(gnus-setup-posting-charset): Declare.
(message-send-news): Require gnus-msg.
(message-make-references, message-make-in-reply-to): Use mail-header-id
rather than the alias mail-header-message-id.
(ecomplete-add-item, ecomplete-save): Declare.
(message-put-addresses-in-ecomplete): Require ecomplete.
(ecomplete-display-matches): Autoload.
* gnus/mm-decode.el: Don't require mailcap, gnus-util.
(gnus-map-function, gnus-replace-in-string, gnus-read-shell-command)
(message-fetch-field, mailcap-parse-mailcaps, mailcap-mime-info):
Autoload.
(mailcap-mime-extensions): Declare.
* gnus/mm-encode.el: Don't require mailcap.
(mailcap-extension-to-mime): Autoload.
* gnus/mml-sec.el: Don't require password-cache.
* gnus/mml.el (gnus-setup-posting-charset): Declare rather than autoload.
(mailcap-parse-mimetypes, mailcap-mime-types): Declare.
(mml-minibuffer-read-type): Require mailcap.
(mml-preview): Require gnus-msg.
* gnus/mml1991.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/mml2015.el: Require password-cache.
(password-cache-expiry): Remove declaration.
* gnus/nneething.el (mailcap): Require mailcap.
* gnus/nnheader.el: (declare-function): Add compatibility stub.
(message-remove-header): Declare rather than autoload.
(nnheader-replace-header): Require message.
* gnus/nnimap.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine-user-or-password): Declare.
(nnimap-open-connection): Require netrc.
* gnus/nntp.el (declare-function): Add compatibility stub.
(netrc-parse, netrc-machine, netrc-get): Declare.
(nntp-send-authinfo): Require netrc.
* gnus/rfc2047.el: Don't require qp.
(quoted-printable-encode-region, quoted-printable-decode-string):
Autoload.
* gnus/sieve-mode.el: Don't require easymenu.
(easy-menu-add-item): Autoload it.
* gnus/spam-stat.el (time-to-number-of-days): Autoload it.
* password-cache.el (password-cache, password-cache-expiry):
Autoload.
2010-03-19 02:55:37 +00:00
|
|
|
(require 'gnus-msg) ; for gnus-setup-posting-charset
|
2004-09-04 13:13:48 +00:00
|
|
|
(save-excursion
|
|
|
|
(let* ((buf (current-buffer))
|
2010-10-22 04:15:14 +00:00
|
|
|
(article-editing (eq major-mode 'gnus-article-edit-mode))
|
2004-09-04 13:13:48 +00:00
|
|
|
(message-options message-options)
|
|
|
|
(message-this-is-mail (message-mail-p))
|
|
|
|
(message-this-is-news (message-news-p))
|
|
|
|
(message-posting-charset (or (gnus-setup-posting-charset
|
|
|
|
(save-restriction
|
|
|
|
(message-narrow-to-headers-or-head)
|
|
|
|
(message-fetch-field "Newsgroups")))
|
|
|
|
message-posting-charset)))
|
|
|
|
(message-options-set-recipient)
|
|
|
|
(when (boundp 'gnus-buffers)
|
2007-10-28 09:18:39 +00:00
|
|
|
(push mml-preview-buffer gnus-buffers))
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(set-buffer mml-preview-buffer)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert-buffer-substring buf))
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-preview-insert-mail-followup-to)
|
|
|
|
(let ((message-deletable-headers (if (message-news-p)
|
|
|
|
nil
|
2010-10-22 04:15:14 +00:00
|
|
|
message-deletable-headers))
|
|
|
|
(mail-header-separator (if article-editing
|
|
|
|
""
|
|
|
|
mail-header-separator)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(message-generate-headers
|
|
|
|
(copy-sequence (if (message-news-p)
|
|
|
|
message-required-news-headers
|
2010-10-22 04:15:14 +00:00
|
|
|
message-required-mail-headers)))
|
2010-10-22 04:30:27 +00:00
|
|
|
(unless article-editing
|
|
|
|
(if (re-search-forward
|
|
|
|
(concat "^" (regexp-quote mail-header-separator) "\n") nil t)
|
|
|
|
(replace-match "\n"))
|
|
|
|
(setq mail-header-separator ""))
|
2007-10-28 09:18:39 +00:00
|
|
|
(message-sort-headers)
|
2004-09-04 13:13:48 +00:00
|
|
|
(mml-to-mime))
|
|
|
|
(if raw
|
|
|
|
(when (fboundp 'set-buffer-multibyte)
|
|
|
|
(let ((s (buffer-string)))
|
|
|
|
;; Insert the content into unibyte buffer.
|
|
|
|
(erase-buffer)
|
|
|
|
(mm-disable-multibyte)
|
|
|
|
(insert s)))
|
|
|
|
(let ((gnus-newsgroup-charset (car message-posting-charset))
|
2010-11-25 05:09:25 +00:00
|
|
|
gnus-article-prepare-hook gnus-original-article-buffer
|
|
|
|
gnus-displaying-mime)
|
2004-09-04 13:13:48 +00:00
|
|
|
(run-hooks 'gnus-article-decode-hook)
|
|
|
|
(let ((gnus-newsgroup-name "dummy")
|
|
|
|
(gnus-newsrc-hashtb (or gnus-newsrc-hashtb
|
|
|
|
(gnus-make-hashtable 5))))
|
|
|
|
(gnus-article-prepare-display))))
|
|
|
|
;; Disable article-mode-map.
|
|
|
|
(use-local-map nil)
|
|
|
|
(gnus-make-local-hook 'kill-buffer-hook)
|
|
|
|
(add-hook 'kill-buffer-hook
|
|
|
|
(lambda ()
|
|
|
|
(mm-destroy-parts gnus-article-mime-handles)) nil t)
|
|
|
|
(setq buffer-read-only t)
|
|
|
|
(local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
|
|
|
|
(local-set-key "=" (lambda () (interactive) (delete-other-windows)))
|
|
|
|
(local-set-key "\r"
|
|
|
|
(lambda ()
|
|
|
|
(interactive)
|
|
|
|
(widget-button-press (point))))
|
|
|
|
(local-set-key gnus-mouse-2
|
|
|
|
(lambda (event)
|
|
|
|
(interactive "@e")
|
|
|
|
(widget-button-press (widget-event-point event) event)))
|
2007-10-28 09:18:39 +00:00
|
|
|
;; FIXME: Buffer is in article mode, but most tool bar commands won't
|
|
|
|
;; work. Maybe only keep the following icons: search, print, quit
|
|
|
|
(goto-char (point-min))))
|
|
|
|
(if (and (not (mm-special-display-p (buffer-name mml-preview-buffer)))
|
|
|
|
(boundp 'gnus-buffer-configuration)
|
|
|
|
(assq 'mml-preview gnus-buffer-configuration))
|
|
|
|
(let ((gnus-message-buffer (current-buffer)))
|
|
|
|
(gnus-configure-windows 'mml-preview))
|
|
|
|
(pop-to-buffer mml-preview-buffer)))
|
2000-09-19 13:40:08 +00:00
|
|
|
|
|
|
|
(defun mml-validate ()
|
|
|
|
"Validate the current MML document."
|
|
|
|
(interactive)
|
|
|
|
(mml-parse))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-tweak-part (cont)
|
|
|
|
"Tweak a MML part."
|
|
|
|
(let ((tweak (cdr (assq 'tweak cont)))
|
|
|
|
func)
|
|
|
|
(cond
|
|
|
|
(tweak
|
|
|
|
(setq func
|
|
|
|
(or (cdr (assoc tweak mml-tweak-function-alist))
|
|
|
|
(intern tweak))))
|
|
|
|
(mml-tweak-type-alist
|
|
|
|
(let ((alist mml-tweak-type-alist)
|
|
|
|
(type (or (cdr (assq 'type cont)) "text/plain")))
|
|
|
|
(while alist
|
|
|
|
(if (string-match (caar alist) type)
|
|
|
|
(setq func (cdar alist)
|
|
|
|
alist nil)
|
|
|
|
(setq alist (cdr alist)))))))
|
|
|
|
(if func
|
|
|
|
(funcall func cont)
|
|
|
|
cont)
|
|
|
|
(let ((alist mml-tweak-sexp-alist))
|
|
|
|
(while alist
|
|
|
|
(if (eval (caar alist))
|
|
|
|
(funcall (cdar alist) cont))
|
|
|
|
(setq alist (cdr alist)))))
|
|
|
|
cont)
|
|
|
|
|
|
|
|
(defun mml-tweak-externalize-attachments (cont)
|
|
|
|
"Tweak attached files as external parts."
|
|
|
|
(let (filename-cons)
|
|
|
|
(when (and (eq (car cont) 'part)
|
|
|
|
(not (cdr (assq 'buffer cont)))
|
|
|
|
(and (setq filename-cons (assq 'filename cont))
|
|
|
|
(not (equal (cdr (assq 'nofile cont)) "yes"))))
|
|
|
|
(setcar cont 'external)
|
|
|
|
(setcar filename-cons 'name))))
|
|
|
|
|
2000-09-19 13:40:08 +00:00
|
|
|
(provide 'mml)
|
|
|
|
|
|
|
|
;;; mml.el ends here
|