Commit 0c47b17c authored by Bill Wohler's avatar Bill Wohler

* mh-comp.el (mh-letter-menu): Rename

mh-mhn-compose-external-compressed-tar to
mh-mh-compose-external-compressed-tar. Rename mh-mhn-compose-anon-ftp
to mh-mh-compose-anon-ftp. Rename mh-edit-mhn to mh-mh-to-mime. Rename
mh-mhn-directive-present-p to mh-mh-directive-present-p. Rename
mh-revert-mhn-edit to mh-mh-to-mime-undo. Rename
mh-gnus-pgp-support-flag to mh-pgp-support-flag. Rename
mh-compose-insertion value from 'mhn to 'mh.
(mh-insert-signature): Rename mh-mhn-directive-present-p to
mh-mh-directive-present-p.
(mh-send-letter): Rename mh-mhn-directive-present-p to
mh-mh-directive-present-p. Rename mh-edit-mhn to mh-mh-to-mime.
(mh-letter-mode-map): Rename mh-edit-mhn to mh-mh-to-mime. Rename
mh-mhn-compose-anon-ftp to mh-mh-compose-anon-ftp. Rename
mh-mhn-compose-external-compressed-tar to
mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit to
mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
mh-mh-compose-external-type. Rename mh-mhn-compose-anon-ftp to
mh-mh-compose-anon-ftp. Rename mh-mhn-compose-external-compressed-tar
to mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit to
mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
mh-mh-compose-external-type.
(mh-send-letter, mh-letter-mode-map): Rename mh-edit-mhn to
mh-mh-to-mime, mh-revert-mhn-edit to mh-mh-to-mime-undo.
(mh-reply, mh-yank-cur-msg, mh-insert-prefix-string): Rename
mh-yank-from-start-of-msg to mh-yank-behavior. (mh-letter-mode,
mh-to-field, mh-to-fcc, mh-insert-signature) (mh-check-whom,
mh-insert-auto-fields, mh-send-letter) (mh-insert-letter,
mh-yank-cur-msg, mh-insert-prefix-string) (mh-fully-kill-draft,
mh-open-line, mh-letter-complete) (mh-letter-complete-or-space,
mh-letter-confirm-address) (mh-letter-next-header-field-or-indent)
(mh-letter-previous-header-field)
(mh-letter-toggle-header-field-display): Sync docstrings with manual.

* mh-customize.el (mh-edit-mhn-hook): Rename to mh-mh-to-mime-hook.
(mh-yank-from-start-of-msg): Rename to mh-yank-behavior.
(mh-compose-insertion): Rename values from 'gnus and 'mhn to 'mh and
user-visible values from mhn and Gnus to MH and MML.
(mh-before-send-letter-hook): Added 'ispell-message option.
(mh-mml-method-default): Rename mh-gnus-pgp-support-flag to
mh-pgp-support-flag. (mh-compose-insertion,
mh-compose-space-does-completion-flag)
(mh-delete-yanked-msg-window-flag) (mh-extract-from-attribution-verb,
mh-ins-buf-prefix) (mh-letter-complete-function,
mh-letter-fill-column) (mh-mml-method-default, mh-signature-file-name)
(mh-signature-separator-flag, mh-x-face-file) (mh-yank-behavior,
mail-citation-hook)
(mh-before-send-letter-hook, mh-mh-to-mime-hook): Sync docstrings with
manual.

* mh-gnus.el (mml-minibuffer-read-disposition): New function provided
for Emacs 21 environments that lack it.

* mh-mime.el (mh-mml-query-cryptographic-method): Use default prompt
convention.
(mh-compose-forward): mh-mh-forward-message requires string arg.
(mh-minibuffer-read-type): New function.
(mh-mhn-args): Rename to mh-mh-to-mime-args.
(mh-mhn-compose-insertion): Rename to mh-mh-attach-file.
(mh-mhn-compose-forw): Rename to mh-mh-forward-message.
(mh-mhn-compose-type): Rename to mh-mh-compose-type.
(mh-mhn-compose-anon-ftp): Rename to mh-mh-compose-anon-ftp. Rename
mh-mhn-compose-external-type to mh-mh-compose-external-type.
(mh-mhn-compose-external-compressed-tar): Rename to
mh-mh-compose-external-compressed-tar. Rename
mh-mhn-compose-external-type to mh-mh-compose-external-type.
(mh-mhn-compose-external-type): Rename to mh-mh-compose-external-type.
(mh-edit-mhn): Rename to mh-mh-to-mime. Rename mh-mhn-args to
mh-mh-to-mime-args. Rename mh-edit-mhn-hook to mh-mh-to-mime-hook. Use
correct program in message.
(mh-mhn-directive-present-p): Rename to mh-mh-directive-present-p.
(mh-mml-directive-present-p): Rename to mh-mml-tag-present-p.
(mh-compose-forward, mh-mh-attach-file) (mh-mh-compose-anon-ftp,
mh-mh-compose-external-compressed-tar) (mh-mh-compose-external-type,
mh-mh-forward-message)
(mh-mml-attach-file): Use mml-minibuffer-read-description,
mh-minibuffer-read-type.
(mh-mime-content-types): Moved comment about only being used in Emacs
20 to docstring.
(mh-mh-compose-external-type): Rename extra-param argument to
parameters. (mh-mml-to-mime, mh-secure-message)
(mh-mml-unsecure-message, mh-mime-display-part)
(mh-mime-display-single): Rename mh-gnus-pgp-support-flag to
mh-pgp-support-flag.
(mh-compose-insertion): Rename mh-mhn-compose-insertion to
mh-mh-attach-file.
(mh-compose-forward): Rename mh-mhn-compose-forw to
mh-mh-forward-message.
(mh-mhn-compose-insertion): Rename mh-mhn-compose-type to
mh-mh-compose-type. (mh-compose-insertion, mh-compose-forward,
mh-mh-to-mime-args) (mh-mh-attach-file, mh-mh-compose-type)
(mh-mh-compose-anon-ftp, mh-mh-compose-external-compressed-tar)
(mh-mh-compose-external-compressed-tar) (mh-mh-compose-external-type,
mh-mh-forward-message) (mh-mh-to-mime, mh-mh-quote-unescaped-sharp,
(mh-mh-to-mime-undo, mh-mh-directive-present-p, mh-mml-to-mime)
(mh-mml-attach-file, mh-secure-message, mh-mml-unsecure-message)
(mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
(mh-mml-directive-present-p, mh-destroy-postponed-handles)
(mh-display-smileys, mh-display-emphasis, mh-mime-save-parts): Sync
docstrings with manual.

* mh-utils.el (mh-gnus-pgp-support-flag): Rename to
mh-pgp-support-flag.
parent a4b0e228
2005-10-23 Bill Wohler <wohler@newt.com>
* mh-comp.el (mh-letter-menu): Rename
mh-mhn-compose-external-compressed-tar to
mh-mh-compose-external-compressed-tar. Rename
mh-mhn-compose-anon-ftp to mh-mh-compose-anon-ftp. Rename
mh-edit-mhn to mh-mh-to-mime. Rename mh-mhn-directive-present-p to
mh-mh-directive-present-p. Rename mh-revert-mhn-edit to
mh-mh-to-mime-undo. Rename mh-gnus-pgp-support-flag to
mh-pgp-support-flag. Rename mh-compose-insertion value from 'mhn
to 'mh.
(mh-insert-signature): Rename mh-mhn-directive-present-p to
mh-mh-directive-present-p.
(mh-send-letter): Rename mh-mhn-directive-present-p to
mh-mh-directive-present-p. Rename mh-edit-mhn to mh-mh-to-mime.
(mh-letter-mode-map): Rename mh-edit-mhn to mh-mh-to-mime. Rename
mh-mhn-compose-anon-ftp to mh-mh-compose-anon-ftp. Rename
mh-mhn-compose-external-compressed-tar to
mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit
to mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
mh-mh-compose-external-type. Rename mh-mhn-compose-anon-ftp to
mh-mh-compose-anon-ftp. Rename
mh-mhn-compose-external-compressed-tar to
mh-mh-compose-external-compressed-tar. Rename mh-revert-mhn-edit
to mh-mh-to-mime-undo. Rename mh-mhn-compose-external-type to
mh-mh-compose-external-type.
(mh-send-letter, mh-letter-mode-map): Rename mh-edit-mhn to
mh-mh-to-mime, mh-revert-mhn-edit to mh-mh-to-mime-undo.
(mh-reply, mh-yank-cur-msg, mh-insert-prefix-string): Rename
mh-yank-from-start-of-msg to mh-yank-behavior.
(mh-letter-mode, mh-to-field, mh-to-fcc, mh-insert-signature)
(mh-check-whom, mh-insert-auto-fields, mh-send-letter)
(mh-insert-letter, mh-yank-cur-msg, mh-insert-prefix-string)
(mh-fully-kill-draft, mh-open-line, mh-letter-complete)
(mh-letter-complete-or-space, mh-letter-confirm-address)
(mh-letter-next-header-field-or-indent)
(mh-letter-previous-header-field)
(mh-letter-toggle-header-field-display): Sync docstrings with
manual.
* mh-customize.el (mh-edit-mhn-hook): Rename to
mh-mh-to-mime-hook.
(mh-yank-from-start-of-msg): Rename to mh-yank-behavior.
(mh-compose-insertion): Rename values from 'gnus and 'mhn to 'mh
and user-visible values from mhn and Gnus to MH and MML.
(mh-before-send-letter-hook): Added 'ispell-message option.
(mh-mml-method-default): Rename mh-gnus-pgp-support-flag to
mh-pgp-support-flag.
(mh-compose-insertion, mh-compose-space-does-completion-flag)
(mh-delete-yanked-msg-window-flag)
(mh-extract-from-attribution-verb, mh-ins-buf-prefix)
(mh-letter-complete-function, mh-letter-fill-column)
(mh-mml-method-default, mh-signature-file-name)
(mh-signature-separator-flag, mh-x-face-file)
(mh-yank-behavior, mail-citation-hook)
(mh-before-send-letter-hook, mh-mh-to-mime-hook): Sync docstrings
with manual.
* mh-gnus.el (mml-minibuffer-read-disposition): New function
provided for Emacs 21 environments that lack it.
* mh-mime.el (mh-mml-query-cryptographic-method): Use default
prompt convention.
(mh-compose-forward): mh-mh-forward-message requires string arg.
(mh-minibuffer-read-type): New function.
(mh-mhn-args): Rename to mh-mh-to-mime-args.
(mh-mhn-compose-insertion): Rename to mh-mh-attach-file.
(mh-mhn-compose-forw): Rename to mh-mh-forward-message.
(mh-mhn-compose-type): Rename to mh-mh-compose-type.
(mh-mhn-compose-anon-ftp): Rename to mh-mh-compose-anon-ftp.
Rename mh-mhn-compose-external-type to
mh-mh-compose-external-type.
(mh-mhn-compose-external-compressed-tar): Rename to
mh-mh-compose-external-compressed-tar. Rename
mh-mhn-compose-external-type to mh-mh-compose-external-type.
(mh-mhn-compose-external-type): Rename to
mh-mh-compose-external-type.
(mh-edit-mhn): Rename to mh-mh-to-mime. Rename mh-mhn-args to
mh-mh-to-mime-args. Rename mh-edit-mhn-hook to mh-mh-to-mime-hook.
Use correct program in message.
(mh-mhn-directive-present-p): Rename to mh-mh-directive-present-p.
(mh-mml-directive-present-p): Rename to mh-mml-tag-present-p.
(mh-compose-forward, mh-mh-attach-file)
(mh-mh-compose-anon-ftp, mh-mh-compose-external-compressed-tar)
(mh-mh-compose-external-type, mh-mh-forward-message)
(mh-mml-attach-file): Use mml-minibuffer-read-description,
mh-minibuffer-read-type.
(mh-mime-content-types): Moved comment about only being used in
Emacs 20 to docstring.
(mh-mh-compose-external-type): Rename extra-param argument to
parameters.
(mh-mml-to-mime, mh-secure-message)
(mh-mml-unsecure-message, mh-mime-display-part)
(mh-mime-display-single): Rename mh-gnus-pgp-support-flag to
mh-pgp-support-flag.
(mh-compose-insertion): Rename mh-mhn-compose-insertion to
mh-mh-attach-file.
(mh-compose-forward): Rename mh-mhn-compose-forw to
mh-mh-forward-message.
(mh-mhn-compose-insertion): Rename mh-mhn-compose-type to
mh-mh-compose-type.
(mh-compose-insertion, mh-compose-forward, mh-mh-to-mime-args)
(mh-mh-attach-file, mh-mh-compose-type)
(mh-mh-compose-anon-ftp, mh-mh-compose-external-compressed-tar)
(mh-mh-compose-external-compressed-tar)
(mh-mh-compose-external-type, mh-mh-forward-message)
(mh-mh-to-mime, mh-mh-quote-unescaped-sharp,
(mh-mh-to-mime-undo, mh-mh-directive-present-p, mh-mml-to-mime)
(mh-mml-attach-file, mh-secure-message, mh-mml-unsecure-message)
(mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
(mh-mml-directive-present-p, mh-destroy-postponed-handles)
(mh-display-smileys, mh-display-emphasis, mh-mime-save-parts):
Sync docstrings with manual.
* mh-utils.el (mh-gnus-pgp-support-flag): Rename to
mh-pgp-support-flag.
2005-10-17 Peter S Galbraith <psg@debian.org> 2005-10-17 Peter S Galbraith <psg@debian.org>
* mh-identity.el (mh-identity-field-handler): Use * mh-identity.el (mh-identity-field-handler): Use
......
This diff is collapsed.
...@@ -762,13 +762,15 @@ installed and you want to use BogoFilter, then you can set this option to ...@@ -762,13 +762,15 @@ installed and you want to use BogoFilter, then you can set this option to
;;; Editing a Draft (:group 'mh-letter) ;;; Editing a Draft (:group 'mh-letter)
(defcustom mh-compose-insertion (if (locate-library "mml") 'gnus 'mhn) (defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh)
"Type of MIME message directives in messages. "Type of tags used when composing MIME messages. In addition to MH-style
directives, MH-E also supports MML (MIME Meta Language) tags. (see Info node
By default, this option is set to `Gnus' if it is supported. This option can `(emacs-mime)Composing'). This option can be used to choose between them. By
also be set manually to `mhn' if mhn directives are preferred." default, this option is set to \"MML\" if it is supported since it provides a
:type '(choice (const :tag "Gnus" gnus) lot more functionality. This option can also be set to \"MH\" if MH-style
(const :tag "mhn" mhn)) directives are preferred."
:type '(choice (const :tag "MML" mml)
(const :tag "MH" mh))
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-compose-skipped-header-fields (defcustom mh-compose-skipped-header-fields
...@@ -779,20 +781,24 @@ also be set manually to `mhn' if mhn directives are preferred." ...@@ -779,20 +781,24 @@ also be set manually to `mhn' if mhn directives are preferred."
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-compose-space-does-completion-flag nil (defcustom mh-compose-space-does-completion-flag nil
"*Non-nil means that <SPC> does completion in message header." "*On means \\<mh-letter-mode-map>\\[mh-letter-complete-or-space] does completion in message header."
:type 'boolean :type 'boolean
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-delete-yanked-msg-window-flag nil (defcustom mh-delete-yanked-msg-window-flag nil
"*Non-nil means delete any window displaying the message. "*On means delete any window displaying the message.
If this option is on, yanking the current message into a draft letter with This deletes the window containing the original message after yanking it with
\\<mh-letter-mode-map>\\[mh-yank-cur-msg] deletes any windows displaying the \\<mh-letter-mode-map>\\[mh-yank-cur-msg] to make more room on your screen for
message." your reply."
:type 'boolean :type 'boolean
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-extract-from-attribution-verb "wrote:" (defcustom mh-extract-from-attribution-verb "wrote:"
"*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]." "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
The attribution consists of the sender's name and email address followed by
the content of this option. This option can be set to \"wrote:\", \"a
écrit:\", and \"schrieb:\". You can also use the \"Custom String\" menu item
to enter your own verb."
:type '(choice (const "wrote:") :type '(choice (const "wrote:")
(const "a écrit:") (const "a écrit:")
(const "schrieb:") (const "schrieb:")
...@@ -800,28 +806,41 @@ message." ...@@ -800,28 +806,41 @@ message."
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-ins-buf-prefix "> " (defcustom mh-ins-buf-prefix "> "
"*String to put before each non-blank line of a yanked or inserted message. "*String to put before each line of a yanked or inserted message.
Used when the message is inserted into an outgoing letter The prefix \"> \" is the default setting of this option. I suggest that you
by \\<mh-letter-mode-map>\\[mh-insert-letter] or \\[mh-yank-cur-msg]." not modify this option since it is used by many mailers and news readers:
messages are far easier to read if several included messages have all been
indented by the same string."
:type 'string :type 'string
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-letter-complete-function 'ispell-complete-word (defcustom mh-letter-complete-function 'ispell-complete-word
"*Function to call when completing outside of address or folder fields. "*Function to call when completing outside of address or folder fields.
By default, this is set to `ispell-complete-word'." In the body of the message, \\<mh-letter-mode-map>\\[mh-letter-complete] runs
this function, which is set to \"ispell-complete-word\" by default."
:type '(choice function (const nil)) :type '(choice function (const nil))
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-letter-fill-column 72 (defcustom mh-letter-fill-column 72
"*Fill column to use in `mh-letter-mode'. "*Fill column to use in MH Letter mode.
This is usually less than in other text modes because email messages get By default, this option is 72 to allow others to quote your message without
quoted by some prefix (sometimes many times) when they are replied to, line wrapping."
and it's best to avoid quoted lines that span more than 80 columns."
:type 'integer :type 'integer
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-mml-method-default (if mh-gnus-pgp-support-flag "pgpmime" "none") (defcustom mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none")
"Default method to use in security directives." "Default method to use in security tags.
This option is used to select between a variety of mail security mechanisms.
The default is \"PGP (MIME)\" if it is supported\; otherwise, the default is
\"None\". Other mechanisms include vanilla \"PGP\" and \"S/MIME\".
The `pgg' customization group may have some settings which may interest you
\(see Info node `(pgg)').
In particular, I set the option `pgg-encrypt-for-me' to t so that all messages
I encrypt are encrypted with my public key as well. If you keep a copy of all
of your outgoing mail with a \"Fcc:\" header field, this setting is vital so
that you can read the mail you write!"
:type '(choice (const :tag "PGP (MIME)" "pgpmime") :type '(choice (const :tag "PGP (MIME)" "pgpmime")
(const :tag "PGP" "pgp") (const :tag "PGP" "pgp")
(const :tag "S/MIME" "smime") (const :tag "S/MIME" "smime")
...@@ -831,13 +850,13 @@ and it's best to avoid quoted lines that span more than 80 columns." ...@@ -831,13 +850,13 @@ and it's best to avoid quoted lines that span more than 80 columns."
(defcustom mh-signature-file-name "~/.signature" (defcustom mh-signature-file-name "~/.signature"
"*Source of user's signature. "*Source of user's signature.
By default, the text of your signature is taken from the file `~/.signature'. By default, the text of your signature is taken from the file \"~/.signature\".
You can read from other files by changing this option. This file may contain a You can read from other files by changing this option. This file may contain a
vCard in which case an attachment is added with the vCard. vCard in which case an attachment is added with the vCard.
This option may also be a symbol, in which case that function is called. You This option may also be a symbol, in which case that function is called. You
may not want a signature separator to be added for you; instead you may want may not want a signature separator to be added for you; instead you may want
to insert one yourself. Variables that you may find useful to do this include to insert one yourself. Options that you may find useful to do this include
`mh-signature-separator' (when inserting a signature separator) and `mh-signature-separator' (when inserting a signature separator) and
`mh-signature-separator-regexp' (for finding said separator). The function `mh-signature-separator-regexp' (for finding said separator). The function
`mh-signature-separator-p', which reports t if the buffer contains a `mh-signature-separator-p', which reports t if the buffer contains a
...@@ -850,7 +869,7 @@ option." ...@@ -850,7 +869,7 @@ option."
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-signature-separator-flag t (defcustom mh-signature-separator-flag t
"*Non-nil means a signature separator should be inserted. "*On means a signature separator should be inserted.
It is not recommended that you change this option since various mail user It is not recommended that you change this option since various mail user
agents, including MH-E, use the separator to present the signature agents, including MH-E, use the separator to present the signature
differently, and to suppress the signature when replying or yanking a letter differently, and to suppress the signature when replying or yanking a letter
...@@ -861,21 +880,21 @@ into a draft." ...@@ -861,21 +880,21 @@ into a draft."
(defcustom mh-x-face-file "~/.face" (defcustom mh-x-face-file "~/.face"
"*File containing face header field to insert in outgoing mail. "*File containing face header field to insert in outgoing mail.
If the file starts with either of the strings `X-Face:', `Face:' or If the file starts with either of the strings \"X-Face:\", \"Face:\" or
`X-Image-URL:' then the contents are added to the message header verbatim. \"X-Image-URL:\" then the contents are added to the message header verbatim.
Otherwise it is assumed that the file contains the value of the `X-Face:' Otherwise it is assumed that the file contains the value of the \"X-Face:\"
header field. header field.
The `X-Face:' header field, which is a low-resolution, black and white image, The \"X-Face:\" header field, which is a low-resolution, black and white
can be generated using the `compface' command, which can be obtained from image, can be generated using the \"compface\"
ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z. The \"Online (ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z) command. The
X-Face Convertor\" at http://www.dairiki.org/xface/ is a useful resource for \"Online X-Face Converter\" (http://www.dairiki.org/xface/) is a useful
quick conversion of images into `X-Face:' header fields. resource for quick conversion of images into \"X-Face:\" header fields.
Use the `make-face' script (http://quimby.gnus.org/circus/face/make-face) to Use the \"make-face\" (http://quimby.gnus.org/circus/face/make-face) script to
convert a JPEG image to the higher resolution, color, `Face:' header field. convert a JPEG image to the higher resolution, color, \"Face:\" header field.
The URL of any image can be used for the `X-Image-URL:' field and no The URL of any image can be used for the \"X-Image-URL:\" field and no
processing of the image is required. processing of the image is required.
To prevent the setting of any of these header fields, either set To prevent the setting of any of these header fields, either set
...@@ -884,39 +903,34 @@ doesn't exist." ...@@ -884,39 +903,34 @@ doesn't exist."
:type 'file :type 'file
:group 'mh-letter) :group 'mh-letter)
(defcustom mh-yank-from-start-of-msg 'attribution (defcustom mh-yank-behavior 'attribution
"*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg]. "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
If t, include the entire message, with full headers. This is historically
here for use with supercite, but is now deprecated in favor of the setting
`supercite' below.
If the symbol `body', then yank the message minus the header.
If the symbol `supercite', include the entire message, with full headers.
This also causes the invocation of `sc-cite-original' without the setting
of `mail-citation-hook', now deprecated practice.
If the symbol `autosupercite', do as for `supercite' automatically when
show buffer matches the message being replied-to. When this option is used,
the -noformat switch is passed to the repl program to override a -filter or
-format switch.
If the symbol `attribution', then yank the message minus the header and add
a simple attribution line at the top.
If the symbol `autoattrib', do as for `attribution' automatically when show
buffer matches the message being replied-to. You can make sure this is
always the case by setting `mh-reply-show-message-flag' to t (which is the
default) and optionally `mh-delete-yanked-msg-window-flag' to t as well such
that the show window is never displayed. When the `autoattrib' option is
used, the -noformat switch is passed to the repl program to override a
-filter or -format switch.
If nil, yank only the portion of the message following the point.
If the show buffer has a region, this variable is ignored unless its value is To include the entire message, including the entire header, use \"Body and
one of `attribution' or `autoattrib' in which case the attribution is added Header\". Use \"Body\" to yank just the body without the header. To yank only
to the yanked region." the portion of the message following the point, set this option to \"Below
Point\".
Choose \"Invoke supercite\" to pass the entire message and header through
supercite.
If the \"Body With Attribution\" setting is used, then the message minus the
header is yanked and a simple attribution line is added at the top using the
value of the `mh-extract-from-attribution-verb' option. This is the default.
If the \"Invoke supercite\" or \"Body With Attribution\" settings are used,
the \"-noformat\" argument is passed to the \"repl\" program to override a
\"-filter\" or \"-format\" argument. These settings also have
\"Automatically\" variants that perform the action automatically when you
reply so that you don't need to use \\[mh-yank-cur-msg] at all. Note that this
automatic action is only performed if the show buffer matches the message
being replied to. People who use the automatic variants tend to turn on the
`mh-delete-yanked-msg-window-flag' option as well so that the show window is
never displayed.
If the show buffer has a region, the `mh-yank-behavior' option is ignored
unless its value is one of Attribution variants in which case the attribution
is added to the yanked region."
:type '(choice (const :tag "Body and Header" t) :type '(choice (const :tag "Body and Header" t)
(const :tag "Body" body) (const :tag "Body" body)
(const :tag "Below Point" nil) (const :tag "Below Point" nil)
...@@ -1983,26 +1997,17 @@ This button runs `mh-previous-undeleted-msg'") ...@@ -1983,26 +1997,17 @@ This button runs `mh-previous-undeleted-msg'")
(defcustom mail-citation-hook nil (defcustom mail-citation-hook nil
"*Hook for modifying a citation just inserted in the mail buffer. "*Hook for modifying a citation just inserted in the mail buffer.
Each hook function can find the citation between point and mark. You can gain full control over the appearance of the included text by setting
And each hook function should leave point and mark around the citation this hook to a function that modifies it. This hook is ignored if the option
text as modified. `mh-yank-behavior' is set to one of the supercite flavors. Otherwise, this
option controls how much of the message is passed to the hook. The function
If this hook is entirely empty (nil), the text of the message is inserted can find the citation between point and mark and it should leave point and
with `mh-ins-buf-prefix' prefixed to each line. mark around the modified citation text for the next hook function. The
standard prefix `mh-ins-buf-prefix' is not added if this hook is set.
See also the variable `mh-yank-from-start-of-msg', which controls how
much of the message passed to the hook. For example, if you use the hook function trivial-cite
\(http://shasta.cs.uiuc.edu/~lrclause/tc.html) (which is NOT part of Emacs),
This hook was historically provided to set up supercite. You may now leave set `mh-yank-behavior' to \"Body and Header\"."
this nil and set up supercite by setting the variable
`mh-yank-from-start-of-msg' to 'supercite or, for more automatic insertion,
to 'autosupercite.
The hook 'trivial-cite is NOT part of Emacs. It is provided from tc.el,
available here:
http://shasta.cs.uiuc.edu/~lrclause/tc.html
If you use it, customize `mh-yank-from-start-of-msg' to
\"Entire message with headers\"."
:type 'hook :type 'hook
:options '(trivial-cite) :options '(trivial-cite)
:group 'mh-hooks :group 'mh-hooks
...@@ -2022,8 +2027,11 @@ See also `mh-quit-hook'." ...@@ -2022,8 +2027,11 @@ See also `mh-quit-hook'."
:group 'mh-show) :group 'mh-show)
(defcustom mh-before-send-letter-hook nil (defcustom mh-before-send-letter-hook nil
"Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command." "Invoked at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command.
For example, if you want to check your spelling in your message before
sending, add the `ispell-message' function."
:type 'hook :type 'hook
:options '(ispell-message)
:group 'mh-hooks :group 'mh-hooks
:group 'mh-letter) :group 'mh-letter)
...@@ -2033,8 +2041,8 @@ See also `mh-quit-hook'." ...@@ -2033,8 +2041,8 @@ See also `mh-quit-hook'."
:group 'mh-hooks :group 'mh-hooks
:group 'mh-show) :group 'mh-show)
(defcustom mh-edit-mhn-hook nil (defcustom mh-mh-to-mime-hook nil
"Invoked on the formatted letter by \\<mh-letter-mode-map>\\[mh-edit-mhn]." "Invoked on the formatted letter by \\<mh-letter-mode-map>\\[mh-mh-to-mime]."
:type 'hook :type 'hook
:group 'mh-hooks :group 'mh-hooks
:group 'mh-letter) :group 'mh-letter)
......
...@@ -56,26 +56,26 @@ BODY." ...@@ -56,26 +56,26 @@ BODY."
`(defmacro ,function ,arg-list ,@body)))) `(defmacro ,function ,arg-list ,@body))))
(put 'mh-defmacro-compat 'lisp-indent-function 'defun) (put 'mh-defmacro-compat 'lisp-indent-function 'defun)
;; Copy of original function from gnus-util.el ;; Copy of original function from gnus-util.el.
(mh-defun-compat gnus-local-map-property (map) (mh-defun-compat gnus-local-map-property (map)
"Return a list suitable for a text property list specifying keymap MAP." "Return a list suitable for a text property list specifying keymap MAP."
(cond (mh-xemacs-flag (list 'keymap map)) (cond (mh-xemacs-flag (list 'keymap map))
((>= emacs-major-version 21) (list 'keymap map)) ((>= emacs-major-version 21) (list 'keymap map))
(t (list 'local-map map)))) (t (list 'local-map map))))
;; Copy of original function from mm-decode.el ;; Copy of original function from mm-decode.el.
(mh-defun-compat mm-merge-handles (handles1 handles2) (mh-defun-compat mm-merge-handles (handles1 handles2)
(append (if (listp (car handles1)) handles1 (list handles1)) (append (if (listp (car handles1)) handles1 (list handles1))
(if (listp (car handles2)) handles2 (list handles2)))) (if (listp (car handles2)) handles2 (list handles2))))
;; Copy of function from mm-decode.el ;; Copy of function from mm-decode.el.
(mh-defun-compat mm-set-handle-multipart-parameter (handle parameter value) (mh-defun-compat mm-set-handle-multipart-parameter (handle parameter value)
;; HANDLE could be a CTL. ;; HANDLE could be a CTL.
(if handle (if handle
(put-text-property 0 (length (car handle)) parameter value (put-text-property 0 (length (car handle)) parameter value
(car handle)))) (car handle))))
;; Copy of function from mm-view.el ;; Copy of function from mm-view.el.
(mh-defun-compat mm-inline-text-vcard (handle) (mh-defun-compat mm-inline-text-vcard (handle)
(let (buffer-read-only) (let (buffer-read-only)
(mm-insert-inline (mm-insert-inline
...@@ -89,15 +89,15 @@ BODY." ...@@ -89,15 +89,15 @@ BODY."
'vcard-standard-filter)))))))) 'vcard-standard-filter))))))))
;; Function from mm-decode.el used in PGP messages. Just define it with older ;; Function from mm-decode.el used in PGP messages. Just define it with older
;; gnus to avoid compiler warning. ;; Gnus to avoid compiler warning.
(mh-defun-compat mm-possibly-verify-or-decrypt (parts ctl) (mh-defun-compat mm-possibly-verify-or-decrypt (parts ctl)
nil) nil)
;; Copy of original macro is in mm-decode.el ;; Copy of original macro is in mm-decode.el.
(mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter) (mh-defmacro-compat mm-handle-multipart-ctl-parameter (handle parameter)
`(get-text-property 0 ,parameter (car ,handle))) `(get-text-property 0 ,parameter (car ,handle)))
;; Copy of original function in mm-decode.el ;; Copy of original function in mm-decode.el.
(mh-defun-compat mm-readable-p (handle) (mh-defun-compat mm-readable-p (handle)
"Say whether the content of HANDLE is readable." "Say whether the content of HANDLE is readable."
(and (< (with-current-buffer (mm-handle-buffer handle) (and (< (with-current-buffer (mm-handle-buffer handle)
...@@ -107,7 +107,7 @@ BODY." ...@@ -107,7 +107,7 @@ BODY."
(and (eq (mm-body-7-or-8) '7bit) (and (eq (mm-body-7-or-8) '7bit)
(not (mm-long-lines-p 76)))))) (not (mm-long-lines-p 76))))))
;; Copy of original function in mm-bodies.el ;; Copy of original function in mm-bodies.el.
(mh-defun-compat mm-long-lines-p (length) (mh-defun-compat mm-long-lines-p (length)
"Say whether any of the lines in the buffer is longer than LENGTH." "Say whether any of the lines in the buffer is longer than LENGTH."
(save-excursion (save-excursion
...@@ -126,10 +126,25 @@ BODY." ...@@ -126,10 +126,25 @@ BODY."
nil) nil)
(mh-defun-compat mm-destroy-parts (list) (mh-defun-compat mm-destroy-parts (list)
"Older emacs don't have this function." "Older versions of Emacs don't have this function."
nil) nil)
;;; This is mm-save-part from gnus 5.10 since that function in emacs21.2 is ;; Copy of original function in mml.el.
(mh-defun-compat mml-minibuffer-read-disposition (type &optional default)
(unless default (setq default
(if (and (string-match "\\`text/" type)
(not (string-match "\\`text/rtf\\'" type)))
"inline"
"attachment")))
(let ((disposition (completing-read
(format "Disposition (default %s): " default)
'(("attachment") ("inline") (""))
nil t nil nil default)))
(if (not (equal disposition ""))
disposition
default)))
;;; This is mm-save-part from Gnus 5.10 since that function in emacs21.2 is
;;; buggy (the args to read-file-name are incorrect). When all supported ;;; buggy (the args to read-file-name are incorrect). When all supported
;;; versions of Emacs come with at least Gnus 5.10, we can delete this ;;; versions of Emacs come with at least Gnus 5.10, we can delete this
;;; function and rename calls to mh-mm-save-part to mm-save-part. ;;; function and rename calls to mh-mm-save-part to mm-save-part.
...@@ -152,7 +167,7 @@ BODY." ...@@ -152,7 +167,7 @@ BODY."
(mm-save-part-to-file handle file)))) (mm-save-part-to-file handle file))))
(defun mh-mm-text-html-renderer () (defun mh-mm-text-html-renderer ()
"Find the renderer gnus is using to display text/html MIME parts." "Find the renderer Gnus is using to display text/html MIME parts."
(or (and (boundp 'mm-inline-text-html-renderer) mm-inline-text-html-renderer) (or (and (boundp 'mm-inline-text-html-renderer) mm-inline-text-html-renderer)
(and (boundp 'mm-text-html-renderer) mm-text-html-renderer))) (and (boundp 'mm-text-html-renderer) mm-text-html-renderer)))
......
This diff is collapsed.
...@@ -175,8 +175,8 @@ Use `mh-signature-separator-regexp' when searching for a separator.") ...@@ -175,8 +175,8 @@ Use `mh-signature-separator-regexp' when searching for a separator.")
(defvar mh-globals-hash (make-hash-table) (defvar mh-globals-hash (make-hash-table)
"Keeps track of MIME data on a per buffer basis.") "Keeps track of MIME data on a per buffer basis.")
(defvar mh-gnus-pgp-support-flag (not (not (locate-library "mml2015"))) (defvar mh-pgp-support-flag (not (not (locate-library "mml2015")))
"Non-nil means installed Gnus has PGP support.") "Non-nil means PGP support is available.")
(defvar mh-mm-inline-media-tests (defvar mh-mm-inline-media-tests
`(("image/jpeg" `(("image/jpeg"
...@@ -410,10 +410,10 @@ Argument LIMIT limits search." ...@@ -410,10 +410,10 @@ Argument LIMIT limits search."