Merge from origin/emacs-25

[gnu-emacs] / lisp / mh-e / mh-print.el

diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 1f128554a51860d471210c955cb7a5b33dbb1766..5aa7297795fc3664526679838cd89efd8c458baf 100644 (file)
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -1,6 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -104,8 +104,7 @@ If FILE is nil, then the messages are spooled to the printer."
 
 (defun mh-ps-spool-buffer (buffer)
   "Spool BUFFER."
-  (save-excursion
-    (set-buffer buffer)
+  (with-current-buffer buffer
     (let ((ps-print-color-p mh-ps-print-color-option)
           (ps-left-header
            (list
@@ -140,11 +139,11 @@ commands \\[mh-ps-print-toggle-color] and
   (interactive (list (mh-interactive-range "Print") (mh-ps-print-preprint 1)))
   (mh-ps-print-range range file))
 
-(defun mh-ps-print-preprint (prefix-arg)
+(defun mh-ps-print-preprint (arg)
   "Provide a better default file name for `ps-print-preprint'.
-Pass along the PREFIX-ARG to it."
+Pass along the prefix ARG to it."
   (let ((buffer-file-name (format "mh-%s" (substring (buffer-name) 1))))
-    (ps-print-preprint prefix-arg)))
+    (ps-print-preprint arg)))
 
 ;;;###mh-autoload
 (defun mh-ps-print-toggle-faces ()
@@ -248,5 +247,4 @@ Consider using \\[mh-ps-print-msg] instead."
 ;; sentence-end-double-space: nil
 ;; End:
 
-;; arch-tag: 8d84d50b-2a49-4d0d-b51e-ba9c9b6fc679
 ;;; mh-print.el ends here