*** empty log message ***

1 files changed, 12 insertions, 15 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7296a524099..54d04e79506 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -69,9 +69,10 @@ nil means use indentation.")
 (defvar mail-abbrevs-loaded nil)
 (defvar mail-mode-map nil)
 
-(defvar mail-signature nil
-  "*Text inserted at end of mail buffer when a message is initialized.
-If t, it means to insert the contents of the file `~/.signature'.")
+;;;###autoload
+(defvar mail-signature-file "~/.signature"
+  "*Name of file to insert at the end of the mail buffer.
+The text is inserted when the message is initialized.")
 
 (defvar mail-reply-buffer nil)
 (defvar mail-send-actions nil
@@ -122,14 +123,10 @@ so you can edit or delete these lines.")
         (insert "BCC: " (user-login-name) "\n"))
     (if mail-archive-file-name
         (insert "FCC: " mail-archive-file-name "\n"))
-    (insert mail-header-separator "\n")
-    ;; Read the .signature file if we haven't already done so
-    ;; (and if the user has not overridden it).
-    (cond ((eq mail-signature t)
-           (insert "--\n")
-           (insert-file-contents "~/.signature"))
-          (mail-signature
-           (insert mail-signature)))
+    (insert mail-header-separator "\n\n")
+    ;; Read the .signature file.
+    (if mail-signature-file
+        (insert-file-contents (expand-file-name mail-signature-file)))
     (goto-char (point-max))
     (or (bolp) (newline)))
   (if to (goto-char (point-max)))
@@ -480,7 +477,7 @@ the user from the mailer."
   (search-forward (concat "\n" mail-header-separator "\n")))
 
 (defun mail-signature (atpoint)
-  "Sign letter with contents of ~/.signature file."
+  "Sign letter with contents of mail-signature-file."
   (interactive "P")
   (save-excursion
     (or atpoint
@@ -490,7 +487,7 @@ the user from the mailer."
     (or atpoint
         (delete-region (point) (point-max)))
     (insert "\n\n--\n")
-    (insert-file-contents (expand-file-name "~/.signature"))))
+    (insert-file-contents (expand-file-name mail-signature-file))))
 
 (defun mail-fill-yanked-message (&optional justifyp)
   "Fill the paragraphs of a message yanked into this one.
@@ -554,8 +551,8 @@ and don't delete any header fields."
 When this function returns, the buffer `*mail*' is selected.
 The value is t if the message was newly initialized; otherwise, nil.
 
-By default, the signature file `~/.signature' is inserted at the end;
-see the variable `mail-signature'.
+By default, the file named by the variable `mail-signature-file' is
+inserted at the end; by default, this is \"~/.signature\".
 
 \\<mail-mode-map>
 While editing message, type \\[mail-send-and-exit] to send the message and exit.