(custom-face-value-create): If face name doesn't end with "face", add

[bpt/emacs.git] / lisp / lpr.el

diff --git a/lisp/lpr.el b/lisp/lpr.el
index 0ed7a1c..21a1ed2 100644 (file)
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -115,7 +115,7 @@ See definition of `print-region-1' for calling conventions."
 
 ;; Berkeley systems support -F, and GNU pr supports both -f and -F,
 ;; So it looks like -F is a better default.
-(defcustom lpr-page-header-switches '("-F")
+(defcustom lpr-page-header-switches '("-h" "-F")
   "*List of strings to use as options for the page-header-generating program.
 The variable `lpr-page-header-program' specifies the program to use."
   :type '(repeat string)
@@ -123,34 +123,51 @@ The variable `lpr-page-header-program' specifies the program to use."
 
 ;;;###autoload
 (defun lpr-buffer ()
-  "Print buffer contents as with Unix command `lpr'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Print buffer contents without pagination or page headers.
+See the variables `lpr-switches' and `lpr-command'
+for customization of the printer command."
   (interactive)
   (print-region-1 (point-min) (point-max) lpr-switches nil))
 
 ;;;###autoload
 (defun print-buffer ()
   "Paginate and print buffer contents.
-Normally invokes `pr' for pagination, but see the variable
-`lpr-page-header-program'.  Printing is normally done with `lpr'
-or `lp'; the variable `lpr-command' changes this.
 
-Also see the variables `lpr-switches' and `lpr-page-header-switches'
-for further customization of the commands used."
+The variable `lpr-headers-switches' controls how to paginate.
+If it is nil (the default), we run the `pr' program (or whatever program
+`lpr-page-header-program' specifies) to paginate.
+`lpr-page-header-switches' specifies the switches for that program.
+
+Otherwise, the switches in `lpr-headers-switches' are used
+in the print command itself; we expect them to request pagination.
+ 
+See the variables `lpr-switches' and `lpr-command'
+for further customization of the printer command."
   (interactive)
   (print-region-1 (point-min) (point-max) lpr-switches t))
 
 ;;;###autoload
 (defun lpr-region (start end)
-  "Print region contents as with Unix command `lpr'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Print region contents without pagination or page headers.
+See the variables `lpr-switches' and `lpr-command'
+for customization of the printer command."
   (interactive "r")
   (print-region-1 start end lpr-switches nil))
 
 ;;;###autoload
 (defun print-region (start end)
-  "Print region contents as with Unix command `lpr -p'.
-`lpr-switches' is a list of extra switches (strings) to pass to lpr."
+  "Paginate and print the region contents.
+
+The variable `lpr-headers-switches' controls how to paginate.
+If it is nil (the default), we run the `pr' program (or whatever program
+`lpr-page-header-program' specifies) to paginate.
+`lpr-page-header-switches' specifies the switches for that program.
+
+Otherwise, the switches in `lpr-headers-switches' are used
+in the print command itself; we expect them to request pagination.
+ 
+See the variables `lpr-switches' and `lpr-command'
+for further customization of the printer command."
   (interactive "r")
   (print-region-1 start end lpr-switches t))
 
@@ -199,20 +216,23 @@ for further customization of the commands used."
              (setq start (car new-coords) end (cdr new-coords)))
            (apply 'call-process-region start end lpr-page-header-program
                                 t t nil
-                                (nconc (list "-h" title)
-                                       lpr-page-header-switches))
+                                lpr-page-header-switches)
            (setq start (point-min) end (point-max))))
-      (apply (or print-region-function 'call-process-region)
-            (nconc (list start end lpr-command
-                         nil nil nil)
-                   (nconc (and lpr-add-switches
-                               (list "-J" name))
-                          ;; These belong in pr if we are using that.
-                          (and lpr-add-switches lpr-headers-switches
-                               (list "-T" title))
-                          (and (stringp printer-name)
-                               (list (concat "-P" printer-name)))
-                          switches)))
+      (let ((printer-name-switch (if (memq system-type
+                                          '(usg-unix-v dgux hpux irix))
+                                    "-d" "-P")))
+       (apply (or print-region-function 'call-process-region)
+              (nconc (list start end lpr-command
+                           nil nil nil)
+                     (nconc (and lpr-add-switches
+                                 (list "-J" name))
+                            ;; These belong in pr if we are using that.
+                            (and lpr-add-switches lpr-headers-switches
+                                 (list "-T" title))
+                            (and (stringp printer-name)
+                                 (list (concat printer-name-switch
+                                               printer-name)))
+                            switches))))
       (if (markerp end)
          (set-marker end nil))
       (message "Spooling%s...done" switch-string))))