mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/lpr.el (print-region-1): Echo lpr-program's output, so error messages

Browse source 
and warnings are not silently discarded (e.g. use "-d" instead of "-P").
This commit is contained in:
Stefan Monnier 2011-05-06 13:38:02 -03:00
parent af4c0e2849
commit 6c19f744bb
2 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
* lpr.el (print-region-1): Echo lpr-program's output, so error messages
and warnings are not silently discarded (e.g. use "-d" instead of "-P").
2011-05-06 Glenn Morris <rgm@gnu.org>
* calendar/appt.el (appt-message-warning-time): Doc fix.

41
lisp/lpr.el
View file

@ -29,6 +29,8 @@
;;; Code:
(eval-when-compile (require 'cl))
;;;###autoload
(defvar lpr-windows-system
(memq system-type '(ms-dos windows-nt)))
@ -258,21 +260,30 @@ for further customization of the printer command."
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)
(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 lpr-printer-switch
printer-name)))
nswitches))
(if (markerp end)
(set-marker end nil))
(message "Spooling%s...done" switch-string))))
(let ((buf (current-buffer)))
(with-temp-buffer
(let ((tempbuf (current-buffer)))
(with-current-buffer buf
(apply (or print-region-function 'call-process-region)
(nconc (list start end lpr-command
nil tempbuf nil)
(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 lpr-printer-switch
printer-name)))
nswitches))))
(if (markerp end)
(set-marker end nil))
(message "Spooling%s...done%s%s" switch-string
(case (count-lines (point-min) (point-max))
(0 "")
(1 ": ")
(t ":\n"))
(buffer-string)))))))
;; This function copies the text between start and end
;; into a new buffer, makes that buffer current.