Mercurial > hg > xemacs-beta
diff lisp/printer.el @ 4558:d9fcb5442c95
Automated merge with file:/Sources/xemacs-21.5-checked-out
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 21 May 2008 21:47:42 +0200 |
parents | 554b9d31e7a5 |
children | 308d34e9f07d |
line wrap: on
line diff
--- a/lisp/printer.el Tue May 13 20:26:47 2008 +0200 +++ b/lisp/printer.el Wed May 21 21:47:42 2008 +0200 @@ -263,7 +263,7 @@ (let* ((print-region (and (interactive-p) (region-active-p))) (start (if print-region (region-beginning) (point-min buffer))) (end (if print-region (region-end) (point-max buffer)))) - (if (or (not (valid-specifier-tag-p 'msprinter)) + (if (or (not (valid-device-type-p 'msprinter)) (not display-print-dialog)) (generic-print-region start end buffer) (let* ((d (Printer-get-device)) @@ -312,7 +312,7 @@ to-page Last page to print, inclusive, If omitted, printing ends at the end. copies Number of copies to print. If omitted, one copy is printed." - (cond ((valid-specifier-tag-p 'msprinter) + (cond ((valid-device-type-p 'msprinter) ;; loop, printing one copy of document per loop. kill and ;; re-create the frame each time so that we eject the piece ;; of paper at the end even if we're printing more than one