diff options
| author | Robert Pluim | 2019-05-13 16:45:16 -0400 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-05-13 16:46:27 -0400 |
| commit | 2ecb7c5c0bc7c74df0751bbd3824de4aec8ed467 (patch) | |
| tree | 1f3c54e12c6a20aa8e36324da14dcab22dc596e9 | |
| parent | cd5b0538c5ba1b4bb243897de0e1dbea3fad0637 (diff) | |
| download | emacs-2ecb7c5c0bc7c74df0751bbd3824de4aec8ed467.tar.gz emacs-2ecb7c5c0bc7c74df0751bbd3824de4aec8ed467.zip | |
Document nil value of message-signature and mail-signature
* lisp/gnus/message.el (message-signature): Allow nil as a
customizable value, and describe its effect.
* lisp/mail/sendmail.el (mail-signature): Describe effect of nil
value (bug#32680).
| -rw-r--r-- | lisp/gnus/message.el | 10 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 442104af8a8..b68b953464d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el | |||
| @@ -1078,13 +1078,15 @@ point and mark around the citation text as modified." | |||
| 1078 | 1078 | ||
| 1079 | (defcustom message-signature mail-signature | 1079 | (defcustom message-signature mail-signature |
| 1080 | "String to be inserted at the end of the message buffer. | 1080 | "String to be inserted at the end of the message buffer. |
| 1081 | If t, the `message-signature-file' file will be inserted instead. | 1081 | If nil, don't insert a signature. |
| 1082 | If a function, the result from the function will be used instead. | 1082 | If t, insert `message-signature-file'. |
| 1083 | If a form, the result from the form will be used instead." | 1083 | If a function or form, insert its result. |
| 1084 | See `mail-signature' for the recommended format of a signature." | ||
| 1084 | :version "23.2" | 1085 | :version "23.2" |
| 1085 | :type '(choice string (const :tag "Contents of signature file" t) | 1086 | :type '(choice string (const :tag "Contents of signature file" t) |
| 1086 | function | 1087 | function |
| 1087 | sexp) | 1088 | sexp |
| 1089 | (const :tag "None" nil)) | ||
| 1088 | :risky t | 1090 | :risky t |
| 1089 | :link '(custom-manual "(message)Insertion Variables") | 1091 | :link '(custom-manual "(message)Insertion Variables") |
| 1090 | :group 'message-insertion) | 1092 | :group 'message-insertion) |
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 93b6c90521b..208ebb68017 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el | |||
| @@ -370,6 +370,7 @@ By default, this is the file specified by `mail-personal-alias-file'." t) | |||
| 370 | ;;;###autoload | 370 | ;;;###autoload |
| 371 | (defcustom mail-signature t | 371 | (defcustom mail-signature t |
| 372 | "Text inserted at end of mail buffer when a message is initialized. | 372 | "Text inserted at end of mail buffer when a message is initialized. |
| 373 | If nil, no signature is inserted. | ||
| 373 | If t, it means to insert the contents of the file `mail-signature-file'. | 374 | If t, it means to insert the contents of the file `mail-signature-file'. |
| 374 | If a string, that string is inserted. | 375 | If a string, that string is inserted. |
| 375 | (To make a proper signature, the string should begin with \\n\\n-- \\n, | 376 | (To make a proper signature, the string should begin with \\n\\n-- \\n, |