Merge from mainline.

[gnu-emacs] / lisp / mail / mailpost.el

diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 6423cd02b72bd3328042563b462bbeb3c91bef3f..7c4bea830d8f5fc93dcff6c5de96306a950f490b 100644 (file)
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -1,7 +1,7 @@
 ;;; 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.
+;; since Delp distributed it in 1986 without a copyright notice.
 
 ;; This file is part of GNU Emacs.
 
@@ -36,8 +36,7 @@ site-init."
        delimline
        (mailbuf (current-buffer)))
     (unwind-protect
-       (save-excursion
-         (set-buffer tembuf)
+       (with-current-buffer tembuf
          (erase-buffer)
          (insert-buffer-substring mailbuf)
          (goto-char (point-max))
@@ -73,8 +72,7 @@ site-init."
            (if (re-search-forward "^Subject:[ \t]*\n" delimline t)
                (replace-match ""))
            (if mail-interactive
-               (save-excursion
-                 (set-buffer errbuf)
+               (with-current-buffer errbuf
                  (erase-buffer))))
          (let ((m (default-file-modes)))
            (unwind-protect
@@ -91,8 +89,7 @@ site-init."
                         (if mail-interactive '("-watch") '("-nowatch"))
                         (list temfile)))
          (if mail-interactive
-             (save-excursion
-               (set-buffer errbuf)
+             (with-current-buffer errbuf
                (goto-char (point-min))
                (while (re-search-forward "\n\n* *" nil t)
                  (replace-match "; "))
@@ -105,5 +102,4 @@ site-init."
 
 (provide 'mailpost)
 
-;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124
 ;;; mailpost.el ends here