Add arch taglines

[bpt/emacs.git] / lisp / mail / mailpost.el

diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 4124c1e..8d57de6 100644 (file)
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -1,12 +1,14 @@
 ;;; mailpost.el --- RMAIL coupler to /usr/uci/post mailer
 
+;; This is in the public domain
+;; since Delp distributed it without a copyright notice in 1986.
+
+;; This file is part of GNU Emacs.
+
 ;; Author: Gary Delp <delp@huey.Udel.Edu>
 ;; Maintainer: FSF
 ;; Created: 13 Jan 1986
-;; Last-Modified: 30 May 1992
-
-;; This is in the public domain
-;; since Delp distributed it without a copyright notice in 1986.
+;; Keywords: mail
 
 ;;; Commentary:
 
@@ -16,6 +18,9 @@
 
 ;;; Code:
 
+(require 'mailalias)
+(require 'sendmail)
+
 ;; (setq send-mail-function 'post-mail-send-it)
 
 (defun post-mail-send-it ()
@@ -25,7 +30,7 @@ site-init."
   (let ((errbuf (if mail-interactive
                    (generate-new-buffer " post-mail errors")
                  0))
-       (temfile "/tmp/,rpost")
+       temfile
        (tembuf (generate-new-buffer " post-mail temp"))
        (case-fold-search nil)
        delimline
@@ -40,10 +45,7 @@ site-init."
          (or (= (preceding-char) ?\n)
              (insert ?\n))
          ;; Change header-delimiter to be what post-mail expects.
-         (goto-char (point-min))
-         (search-forward (concat "\n" mail-header-separator "\n"))
-         (replace-match "\n\n")
-         (backward-char 1)
+         (mail-sendmail-undelimit-header)
          (setq delimline (point-marker))
          (if mail-aliases
              (expand-mail-aliases (point-min) delimline))
@@ -74,8 +76,12 @@ site-init."
                (save-excursion
                  (set-buffer errbuf)
                  (erase-buffer))))
-         (write-file (setq temfile (make-temp-name temfile)))
-         (set-file-modes temfile 384)
+         (let ((m (default-file-modes)))
+           (unwind-protect
+               (progn
+                 (set-default-file-modes 384)
+                 (setq temfile  (make-temp-file ",rpost")))
+             (set-default-file-modes m)))
          (apply 'call-process
                 (append (list (if (boundp 'post-mail-program)
                                   post-mail-program
@@ -97,4 +103,7 @@ site-init."
       (if (bufferp errbuf)
          (switch-to-buffer errbuf)))))
 
+(provide 'mailpost)
+
+;;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124
 ;;; mailpost.el ends here