1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-67

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 447-458)

   - Update from CVS
   - Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 83-85)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
This commit is contained in:
Miles Bader 2005-06-30 00:31:46 +00:00
commit eeb88b27e1
79 changed files with 6404 additions and 1266 deletions

View file

@ -10,12 +10,12 @@
;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
;; Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Keywords: wp, print, PostScript
;; Time-stamp: <2005/03/19 00:40:12 vinicius>
;; Version: 6.6.6
;; Time-stamp: <2005/06/27 00:57:22 vinicius>
;; Version: 6.6.7
;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
(defconst ps-print-version "6.6.6"
"ps-print.el, v 6.6.6 <2005/03/19 vinicius>
(defconst ps-print-version "6.6.7"
"ps-print.el, v 6.6.7 <2005/06/27 vinicius>
Vinicius's last change version -- this file may have been edited as part of
Emacs without changes to the version number. When reporting bugs, please also
@ -5936,10 +5936,14 @@ XSTART YSTART are the relative position for the first page in a sheet.")
(ps-begin-page))
(defun ps-end-sheet ()
(and ps-print-page-p (> ps-page-sheet 0)
(ps-output "EndSheet\n")))
(defun ps-header-sheet ()
;; Print only when a new sheet begins.
(and ps-print-page-p (> ps-page-sheet 0)
(ps-output "EndSheet\n"))
(ps-end-sheet)
(setq ps-page-sheet (1+ ps-page-sheet))
(when (ps-print-sheet-p)
(setq ps-page-order (1+ ps-page-order))
@ -6624,8 +6628,7 @@ If FACE is not a valid face name, it is used default face."
(defun ps-end-job (needs-begin-file)
(let ((previous-print ps-print-page-p)
(ps-print-page-p t))
(let ((ps-print-page-p t))
(ps-flush-output)
(save-excursion
(let ((pages-per-sheet (mod ps-page-printed ps-n-up-printing))
@ -6652,8 +6655,7 @@ If FACE is not a valid face name, it is used default face."
(number-to-string ps-lines-printed) " BeginPage\n")
(ps-end-page)))
;; Set end of PostScript file
(and previous-print
(ps-output "EndSheet\n"))
(ps-end-sheet)
(ps-output "\n%%Trailer\n%%Pages: "
(number-to-string
(if (and needs-begin-file