Mercurial > emacs
changeset 10670:f759e91a1654
(lpr-add-switches): Renamed from lpr-add-options.
(print-region-1): If we run pr, give it the -h option
instead of giving lpr the -T option.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 06 Feb 1995 03:30:19 +0000 |
| parents | 53b3d5117779 |
| children | fe4d986bef9d |
| files | lisp/lpr.el |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/lpr.el Mon Feb 06 03:26:35 1995 +0000 +++ b/lisp/lpr.el Mon Feb 06 03:30:19 1995 +0000 @@ -33,7 +33,7 @@ (defvar lpr-switches nil "*List of strings to pass as extra switch args to `lpr' when it is invoked.") -(defvar lpr-add-options (eq system-type 'berkeley-unix) +(defvar lpr-add-switches (eq system-type 'berkeley-unix) "*Non-nil means construct -T and -J options for the `lpr'.") ;;;###autoload @@ -114,14 +114,20 @@ switches)) ;; Run a separate program to get page headers. (print-region-new-buffer start end) - (call-process-region start end lpr-page-header-program - t t lpr-page-header-switches) + (apply 'call-process-region start end lpr-page-header-program + t t nil + (nconc (and lpr-add-switches + (list "-h" title)) + 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-options - (list "-J" name "-T" title)) + (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)) switches))) (if (markerp end) (set-marker end nil))