[Emacs-diffs] Changes to emacs/lisp/printing.el

[Vinicius Jose Latorre]

Index: emacs/lisp/printing.el
diff -c emacs/lisp/printing.el:1.23 emacs/lisp/printing.el:1.24
*** emacs/lisp/printing.el:1.23 Sun Nov 14 16:50:37 2004
--- emacs/lisp/printing.el      Mon Nov 15 19:31:54 2004
***************
*** 5,11 ****
  
  ;; Author: Vinicius Jose Latorre <address@hidden>
  ;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2004/11/14 14:38:36 vinicius>
  ;; Keywords: wp, print, PostScript
  ;; Version: 6.8.3
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
--- 5,11 ----
  
  ;; Author: Vinicius Jose Latorre <address@hidden>
  ;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2004/11/15 17:23:32 vinicius>
  ;; Keywords: wp, print, PostScript
  ;; Version: 6.8.3
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
***************
*** 3882,3888 ****
           ;; use `pr-ps-command' to print
           (apply 'pr-call-process
                  pr-ps-command
!                 (pr-switches-string pr-ps-switches "pr-gs-switches")
                  (if (string-match "cp" pr-ps-command)
                      ;; for "cp" (cmd in out)
                      (list file
--- 3882,3888 ----
           ;; use `pr-ps-command' to print
           (apply 'pr-call-process
                  pr-ps-command
!                 (pr-switches-string pr-ps-switches "pr-ps-switches")
                  (if (string-match "cp" pr-ps-command)
                      ;; for "cp" (cmd in out)
                      (list file
***************
*** 4000,4006 ****
    (interactive)
    (pr-save-interactive
     (pr-toggle 'ps-spool-duplex "Printing duplex"
!             'postcsript-options 5 12 'toggle)))
  
  
  ;;;###autoload
--- 4000,4006 ----
    (interactive)
    (pr-save-interactive
     (pr-toggle 'ps-spool-duplex "Printing duplex"
!             'postscript-options 5 12 'toggle)))
  
  
  ;;;###autoload
***************
*** 5325,5348 ****
  
  
  (defun pr-call-process (command &rest args)
!   (pr-save-file-modes
!    (let ((buffer (get-buffer-create "*Printing Command Output*"))
!        (cmd    (pr-command command))
!        status)
!      (setq args (pr-remove-nil-from-list args))
!      (save-excursion
!        (set-buffer buffer)
!        (goto-char (point-max))
!        (insert (format "%s %S\n" cmd args)))
       (setq status
           (condition-case data
               (apply 'call-process cmd nil buffer nil args)
             ((quit error)
!             (error-message-string data))))
!      (save-excursion
!        (set-buffer buffer)
!        (goto-char (point-max))
!        (insert (format "Exit status: %s\n" status))))))
  
  
  (defun pr-txt-print (from to)
--- 5325,5357 ----
  
  
  (defun pr-call-process (command &rest args)
!   (let ((buffer (get-buffer-create "*Printing Command Output*"))
!       (cmd    (pr-command command))
!       status)
!     (setq args (pr-remove-nil-from-list args))
!     ;; *Printing Command Output* == show command & args
!     (save-excursion
!       (set-buffer buffer)
!       (goto-char (point-max))
!       (insert (format "%s %S\n" cmd args)))
!     ;; *Printing Command Output* == show any return message from command
!     (pr-save-file-modes
       (setq status
           (condition-case data
               (apply 'call-process cmd nil buffer nil args)
             ((quit error)
!             (error-message-string data)))))
!     ;; *Printing Command Output* == show exit status
!     (save-excursion
!       (set-buffer buffer)
!       (goto-char (point-max))
!       (insert (format "Exit status: %s\n\n" status)))
!     ;; message if error status
!     (if (or (stringp status)
!           (and (integerp status) (/= status 0)))
!       (message
!        "Printing error status: %s (see *Printing Command Output* buffer)"
!        status))))
  
  
  (defun pr-txt-print (from to)
***************
*** 5353,5359 ****
  
  
  (defun pr-switches-string (switches mess)
!   (mapconcat 'identity (pr-switches switches mess) " "))
  
  
  (defun pr-switches (switches mess)
--- 5362,5371 ----
  
  
  (defun pr-switches-string (switches mess)
!   ;; If SWITCHES is nil, return nil.
!   ;; Otherwise, return the list of string in a string.
!   (and switches
!        (mapconcat 'identity (pr-switches switches mess) " ")))
  
  
  (defun pr-switches (switches mess)