diff options
| author | Bill Wohler | 2005-10-27 22:57:30 +0000 |
|---|---|---|
| committer | Bill Wohler | 2005-10-27 22:57:30 +0000 |
| commit | 169a3241699ac6c5f90360ac314824feca6fdff0 (patch) | |
| tree | e07916ff2b7ff9b0896237738e40fec6325e3b80 | |
| parent | 1e0ab2f03b2152281ffb06349a4a12b60f48b991 (diff) | |
| download | emacs-169a3241699ac6c5f90360ac314824feca6fdff0.tar.gz emacs-169a3241699ac6c5f90360ac314824feca6fdff0.zip | |
* mh-customize.el (mh-compose-insertion, mh-x-face-file): Checkdoc
fixes.
* mh-mime.el (mh-mh-to-mime, mh-mml-attach-file)
(mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
(mh-mml-secure-message-signencrypt): Ditto
| -rw-r--r-- | lisp/mh-e/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/mh-e/mh-customize.el | 14 | ||||
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 10 |
3 files changed, 21 insertions, 12 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 6c206258d79..76ca6927614 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2005-10-27 Bill Wohler <wohler@newt.com> | ||
| 2 | |||
| 3 | * mh-customize.el (mh-compose-insertion, mh-x-face-file): Checkdoc | ||
| 4 | fixes. | ||
| 5 | |||
| 6 | * mh-mime.el (mh-mh-to-mime, mh-mml-attach-file) | ||
| 7 | (mh-mml-secure-message-sign, mh-mml-secure-message-encrypt) | ||
| 8 | (mh-mml-secure-message-signencrypt): Ditto | ||
| 9 | |||
| 1 | 2005-10-24 Bill Wohler <wohler@newt.com> | 10 | 2005-10-24 Bill Wohler <wohler@newt.com> |
| 2 | 11 | ||
| 3 | * mh-gnus.el: Load mml.el in order to see if | 12 | * mh-gnus.el: Load mml.el in order to see if |
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el index 919a655d78b..d566250cacf 100644 --- a/lisp/mh-e/mh-customize.el +++ b/lisp/mh-e/mh-customize.el | |||
| @@ -763,12 +763,12 @@ installed and you want to use BogoFilter, then you can set this option to | |||
| 763 | ;;; Editing a Draft (:group 'mh-letter) | 763 | ;;; Editing a Draft (:group 'mh-letter) |
| 764 | 764 | ||
| 765 | (defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh) | 765 | (defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh) |
| 766 | "Type of tags used when composing MIME messages. In addition to MH-style | 766 | "Type of tags used when composing MIME messages. |
| 767 | directives, MH-E also supports MML (MIME Meta Language) tags. (see Info node | 767 | In addition to MH-style directives, MH-E also supports MML (MIME Meta |
| 768 | `(emacs-mime)Composing'). This option can be used to choose between them. By | 768 | Language) tags. (see Info node `(emacs-mime)Composing'). This option can be |
| 769 | default, this option is set to \"MML\" if it is supported since it provides a | 769 | used to choose between them. By default, this option is set to \"MML\" if it |
| 770 | lot more functionality. This option can also be set to \"MH\" if MH-style | 770 | is supported since it provides a lot more functionality. This option can also |
| 771 | directives are preferred." | 771 | be set to \"MH\" if MH-style directives are preferred." |
| 772 | :type '(choice (const :tag "MML" mml) | 772 | :type '(choice (const :tag "MML" mml) |
| 773 | (const :tag "MH" mh)) | 773 | (const :tag "MH" mh)) |
| 774 | :group 'mh-letter) | 774 | :group 'mh-letter) |
| @@ -887,7 +887,7 @@ header field. | |||
| 887 | 887 | ||
| 888 | The \"X-Face:\" header field, which is a low-resolution, black and white | 888 | The \"X-Face:\" header field, which is a low-resolution, black and white |
| 889 | image, can be generated using the \"compface\" | 889 | image, can be generated using the \"compface\" |
| 890 | (ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z) command. The | 890 | \(ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z) command. The |
| 891 | \"Online X-Face Converter\" (http://www.dairiki.org/xface/) is a useful | 891 | \"Online X-Face Converter\" (http://www.dairiki.org/xface/) is a useful |
| 892 | resource for quick conversion of images into \"X-Face:\" header fields. | 892 | resource for quick conversion of images into \"X-Face:\" header fields. |
| 893 | 893 | ||
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 70cc1f261db..14acfd7765c 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el | |||
| @@ -429,7 +429,7 @@ you can build a consistency check into the message by setting | |||
| 429 | `mh-mh-to-mime-args' to \"-check\". The recipient of your message can then run | 429 | `mh-mh-to-mime-args' to \"-check\". The recipient of your message can then run |
| 430 | \"mhbuild -check\" on the message--\"mhbuild\" (\"mhn\") will complain if the | 430 | \"mhbuild -check\" on the message--\"mhbuild\" (\"mhn\") will complain if the |
| 431 | message has been corrupted on the way. This command only consults this option | 431 | message has been corrupted on the way. This command only consults this option |
| 432 | when given a prefix argument. | 432 | when given a prefix argument EXTRA-ARGS. |
| 433 | 433 | ||
| 434 | The value of `mh-mh-to-mime-hook' is a list of functions to be called after | 434 | The value of `mh-mh-to-mime-hook' is a list of functions to be called after |
| 435 | the message has been formatted. | 435 | the message has been formatted. |
| @@ -582,7 +582,7 @@ number." | |||
| 582 | (defun mh-mml-attach-file (&optional disposition) | 582 | (defun mh-mml-attach-file (&optional disposition) |
| 583 | "Add a tag to insert a MIME message part from a file. | 583 | "Add a tag to insert a MIME message part from a file. |
| 584 | You are prompted for the filename containing the object, the media type if it | 584 | You are prompted for the filename containing the object, the media type if it |
| 585 | cannot be determined automatically, a content description and the disposition | 585 | cannot be determined automatically, a content description and the DISPOSITION |
| 586 | of the attachment. | 586 | of the attachment. |
| 587 | 587 | ||
| 588 | This is basically `mml-attach-file' from Gnus, modified such that a prefix | 588 | This is basically `mml-attach-file' from Gnus, modified such that a prefix |
| @@ -637,7 +637,7 @@ The argument IGNORE is not used." | |||
| 637 | A proper multipart message is created for you when you send the message. Use | 637 | A proper multipart message is created for you when you send the message. Use |
| 638 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix | 638 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix |
| 639 | argument METHOD to be prompted for one of the possible security methods | 639 | argument METHOD to be prompted for one of the possible security methods |
| 640 | (see `mh-mml-method-default')." | 640 | \(see `mh-mml-method-default')." |
| 641 | (interactive (list (mh-mml-query-cryptographic-method))) | 641 | (interactive (list (mh-mml-query-cryptographic-method))) |
| 642 | (mh-secure-message method "sign" mh-identity-pgg-default-user-id)) | 642 | (mh-secure-message method "sign" mh-identity-pgg-default-user-id)) |
| 643 | 643 | ||
| @@ -647,7 +647,7 @@ argument METHOD to be prompted for one of the possible security methods | |||
| 647 | A proper multipart message is created for you when you send the message. Use | 647 | A proper multipart message is created for you when you send the message. Use |
| 648 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix | 648 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix |
| 649 | argument METHOD to be prompted for one of the possible security methods | 649 | argument METHOD to be prompted for one of the possible security methods |
| 650 | (see `mh-mml-method-default')." | 650 | \(see `mh-mml-method-default')." |
| 651 | (interactive (list (mh-mml-query-cryptographic-method))) | 651 | (interactive (list (mh-mml-query-cryptographic-method))) |
| 652 | (mh-secure-message method "encrypt" mh-identity-pgg-default-user-id)) | 652 | (mh-secure-message method "encrypt" mh-identity-pgg-default-user-id)) |
| 653 | 653 | ||
| @@ -657,7 +657,7 @@ argument METHOD to be prompted for one of the possible security methods | |||
| 657 | A proper multipart message is created for you when you send the message. Use | 657 | A proper multipart message is created for you when you send the message. Use |
| 658 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix | 658 | the \\[mh-mml-unsecure-message] command to remove this tag. Use a prefix |
| 659 | argument METHOD to be prompted for one of the possible security methods | 659 | argument METHOD to be prompted for one of the possible security methods |
| 660 | (see `mh-mml-method-default')." | 660 | \(see `mh-mml-method-default')." |
| 661 | (interactive (list (mh-mml-query-cryptographic-method))) | 661 | (interactive (list (mh-mml-query-cryptographic-method))) |
| 662 | (mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id)) | 662 | (mh-secure-message method "signencrypt" mh-identity-pgg-default-user-id)) |
| 663 | 663 | ||