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

[Richard M. Stallman]

Index: emacs/lisp/ps-print.el
diff -c emacs/lisp/ps-print.el:1.129 emacs/lisp/ps-print.el:1.130
*** emacs/lisp/ps-print.el:1.129        Mon Sep  9 15:26:40 2002
--- emacs/lisp/ps-print.el      Tue Sep 10 12:49:47 2002
***************
*** 10,21 ****
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
  ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2001/09/17 14:50:19 vinicius>
! ;; Version: 6.5.5
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.5.5"
!   "ps-print.el, v 6.5.5 <2001/09/17 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
--- 10,21 ----
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
  ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2002/09/06 20:11:00 vinicius>
! ;; Version: 6.5.6
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.5.6"
!   "ps-print.el, v 6.5.6 <2002/09/06 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
***************
*** 1507,1513 ****
    (defconst ps-windows-system
      (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
    (defconst ps-lp-system
!     (memq system-type '(usg-unix-v dgux hpux irix))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 1507,1520 ----
    (defconst ps-windows-system
      (memq system-type '(emx win32 w32 mswindows ms-dos windows-nt)))
    (defconst ps-lp-system
!     (memq system-type '(usg-unix-v dgux hpux irix)))
! 
! 
!   (defvar ps-print-emacs-type
!     (cond ((string-match "XEmacs" emacs-version) 'xemacs)
!         ((string-match "Lucid" emacs-version) 'lucid)
!         ((string-match "Epoch" emacs-version) 'epoch)
!         (t 'emacs))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 1735,1744 ****
  
  For any other printing utility, see its documentation.
  
! Set this to \"\" or nil, if the utility given by `ps-lpr-command' needs an 
empty
! printer name option.
  
! Any other value is treated as nil, that is, an empty printer name option.
  
  This variable is used only when `ps-printer-name' is a non-empty string."
    :type '(choice :menu-tag "Printer Name Option"
--- 1742,1752 ----
  
  For any other printing utility, see its documentation.
  
! Set this to \"\" or nil, if the utility given by `ps-lpr-command'
! needs an empty printer name option--that is, pass the printer name
! with no special option preceding it.
  
! Any value that is not a string is treated as nil.
  
  This variable is used only when `ps-printer-name' is a non-empty string."
    :type '(choice :menu-tag "Printer Name Option"
***************
*** 1808,1813 ****
--- 1816,1822 ----
  ;; B4         10.125 inch x 14.33  inch
  ;; B5          7.16  inch x 10.125 inch
  
+ ;;;###autoload
  (defcustom ps-page-dimensions-database
    (list (list 'a4    (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4")
        (list 'a3    (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3")
***************
*** 2853,2858 ****
--- 2862,2870 ----
  ;;; Colors
  
  ;; Printing color requires x-color-values.
+ ;; XEmacs change: Need autoload for the "Options->Printing->Color Printing"
+ ;;                widget to work.
+ ;;;###autoload
  (defcustom ps-print-color-p
    (or (and (fboundp 'color-values)    ; Emacs
           (ps-e-color-values "Green"))
***************
*** 3137,3145 ****
    :group 'ps-print-headers)
  
  (defcustom ps-postscript-code-directory
!   (or (and (fboundp 'locate-data-directory) ; xemacs
!          (locate-data-directory "ps-print"))
!       data-directory)                 ; emacs
    "*Directory where it's located the PostScript prologue file used by 
ps-print.
  By default, this directory is the same as in the variable `data-directory'."
    :type 'directory
--- 3149,3164 ----
    :group 'ps-print-headers)
  
  (defcustom ps-postscript-code-directory
!   (or (cond
!        ((eq ps-print-emacs-type 'emacs)       ; emacs
!       data-directory)
!        ((fboundp 'locate-data-directory) ; emacsens (xemacs, etc.)
!       (locate-data-directory "ps-print"))
!        ((boundp 'data-directory)      ; emacsens (xemacs, etc.)
!       data-directory)
!        (t                             ; don't know what to do
!       nil))
!       (error "ps-postscript-code-directory isn't set properly"))
    "*Directory where it's located the PostScript prologue file used by 
ps-print.
  By default, this directory is the same as in the variable `data-directory'."
    :type 'directory
***************
*** 3520,3528 ****
  
  If `ps-prefix-quote' is nil, it's set to t after generating string."
    (cond
-    ((null elt)    "")
     ((stringp elt) elt)
!    (t
      (let* ((col (car elt))
           (sym (cdr elt))
           (key (symbol-name sym))
--- 3539,3547 ----
  
  If `ps-prefix-quote' is nil, it's set to t after generating string."
    (cond
     ((stringp elt) elt)
!    ((and (consp elt) (integerp (car elt))
!        (symbolp (cdr elt)) (boundp (cdr elt)))
      (let* ((col (car elt))
           (sym (cdr elt))
           (key (symbol-name sym))
***************
*** 3540,3545 ****
--- 3559,3565 ----
                    ((eq val t) "t")
                    ((or (symbolp val) (listp val)) (format "'%S" val))
                    (t          (format "%S" val))))))
+    (t "")
     ))
  
  
***************
*** 3597,3610 ****
  
  
  (eval-and-compile
-   (defvar ps-print-emacs-type
-     (cond ((string-match "XEmacs" emacs-version) 'xemacs)
-         ((string-match "Lucid" emacs-version) 'lucid)
-         ((string-match "Epoch" emacs-version) 'epoch)
-         (t 'emacs)))
- 
    (if (memq ps-print-emacs-type '(lucid xemacs))
!       (if (< emacs-minor-version 12)
          (setq ps-print-color-p nil))
      (require 'faces))                 ; face-font, face-underline-p,
                                        ; x-font-regexp
--- 3617,3626 ----
  
  
  (eval-and-compile
    (if (memq ps-print-emacs-type '(lucid xemacs))
!       ;; XEmacs change: Need to check for emacs-major-version too.
!       (if (or (< emacs-major-version 19)
!             (and (= emacs-major-version 19) (< emacs-minor-version 12)))
          (setq ps-print-color-p nil))
      (require 'faces))                 ; face-font, face-underline-p,
                                        ; x-font-regexp
***************
*** 3614,3620 ****
    ;; can handle colors.
    ;; This function is not yet implemented for GNU emacs.
    (cond ((and (eq ps-print-emacs-type 'xemacs)
!             (>= emacs-minor-version 12)) ; xemacs
         (defun ps-color-device ()
           (eq (ps-x-device-class) 'color)))
  
--- 3630,3639 ----
    ;; can handle colors.
    ;; This function is not yet implemented for GNU emacs.
    (cond ((and (eq ps-print-emacs-type 'xemacs)
!             ;; XEmacs change: Need to check for emacs-major-version too.
!             (or (> emacs-major-version 19)
!                 (and (= emacs-major-version 19)
!                      (>= emacs-minor-version 12)))) ; xemacs >= 19.12
         (defun ps-color-device ()
           (eq (ps-x-device-class) 'color)))
  
***************
*** 4411,4417 ****
  
  
  (defun ps-print-preprint-region (prefix-arg)
!   (or mark-active
        (error "The mark is not set now"))
    (list (point) (mark) (ps-print-preprint prefix-arg)))
  
--- 4430,4439 ----
  
  
  (defun ps-print-preprint-region (prefix-arg)
!   (or (and (fboundp 'mark-active)
!          (mark-active))
!       (and (fboundp 'region-active-p)
!          (region-active-p))
        (error "The mark is not set now"))
    (list (point) (mark) (ps-print-preprint prefix-arg)))