# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 792311690 0
# Node ID 8a15461d4f64d140569e6da61d3d30946a183761
# Parent  4a2ea4f52ea022664ce91aa7526eb55989ffacdf
(print-region-1): Include print options in echo area msgs.

diff -r 4a2ea4f52ea0 -r 8a15461d4f64 lisp/lpr.el
--- a/lisp/lpr.el	Thu Feb 09 00:17:31 1995 +0000
+++ b/lisp/lpr.el	Thu Feb 09 06:34:50 1995 +0000
@@ -93,9 +93,22 @@
   ;; and it seems to annoying to do for that MIPS system.
   (let ((name (concat (buffer-name) " Emacs buffer"))
 	(title (concat (buffer-name) " Emacs buffer"))
-	(width tab-width))
+	(width tab-width)
+	switch-string)
     (save-excursion
-      (message "Spooling...")
+      (if page-headers
+	  (if lpr-headers-switches
+	      ;; It is possible to use an lpr option
+	      ;; to get page headers.
+	      (setq switches (append (if (stringp lpr-headers-switches)
+					 (list lpr-headers-switches)
+				        lpr-headers-switches)
+				     switches))))
+      (setq switch-string
+	    (if switches (concat " with options "
+				 (mapconcat 'identity switches " "))
+	      ""))
+      (message "Spooling%s..." switch-string)
       (if (/= tab-width 8)
 	  (let ((new-coords (print-region-new-buffer start end)))
 	    (setq start (car new-coords) end (cdr new-coords))
@@ -106,12 +119,8 @@
 	    (untabify (point-min) (point-max))))
       (if page-headers
 	  (if lpr-headers-switches
-	      ;; It is possible to use an lpr option
-	      ;; to get page headers.
-	      (setq switches (append (if (stringp lpr-headers-switches)
-					 (list lpr-headers-switches)
-				        lpr-headers-switches)
-				     switches))
+	      ;; We handled this above by modifying SWITCHES.
+	      nil
 	    ;; Run a separate program to get page headers.
 	    (let ((new-coords (print-region-new-buffer start end)))
 	      (setq start (car new-coords) end (cdr new-coords)))
@@ -132,7 +141,7 @@
 			   switches)))
       (if (markerp end)
 	  (set-marker end nil))
-      (message "Spooling...done"))))
+      (message "Spooling%s...done" switch-string))))
 
 ;; This function copies the text between start and end
 ;; into a new buffer, makes that buffer current.