Mercurial > emacs

changeset 1024:ceb4469d3cd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Wed, 19 Aug 1992 07:17:26 +0000
parents d31e1e0844aa
children 1ccd97bc1d2b
files lisp/mail/rmail.el lisp/mail/sendmail.el
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/rmail.el	Wed Aug 19 07:06:09 1992 +0000
+++ b/lisp/mail/rmail.el	Wed Aug 19 07:17:26 1992 +0000
@@ -137,12 +137,12 @@
 	(progn
 	  ;; Don't be confused by apparent local-variables spec
 	  ;; in the last message in the RMAIL file.
-	  (let ((inhibit-local-variables t))
+	  (let ((enable-local-variables nil))
 	    (find-file file-name))
 	  (if (verify-visited-file-modtime existed)
 	      (progn (rmail-forget-messages)
 		     (rmail-set-message-counters))))
-      (let ((inhibit-local-variables t))
+      (let ((enable-local-variables nil))
 	(find-file file-name)))
     (if (and existed (> (buffer-size) 0))
 	;; Buffer not new and not empty; ensure in proper mode, but that's all.
--- a/lisp/mail/sendmail.el	Wed Aug 19 07:06:09 1992 +0000
+++ b/lisp/mail/sendmail.el	Wed Aug 19 07:17:26 1992 +0000
@@ -123,10 +123,12 @@
 	(insert "BCC: " (user-login-name) "\n"))
     (if mail-archive-file-name
 	(insert "FCC: " mail-archive-file-name "\n"))
-    (insert mail-header-separator "\n\n")
+    (insert mail-header-separator "\n")
     ;; Read the .signature file.
-    (if mail-signature-file
-	(insert-file-contents (expand-file-name mail-signature-file)))
+    (and mail-signature-file
+	 (file-exists-p mail-signature-file)
+	 (progn (insert "\n")
+		(insert-file-contents (expand-file-name mail-signature-file))))
     (goto-char (point-max))
     (or (bolp) (newline)))
   (if to (goto-char (point-max)))