[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.130 emacs/lisp/ps-print.el:1.131
*** emacs/lisp/ps-print.el:1.130        Tue Sep 10 12:49:47 2002
--- emacs/lisp/ps-print.el      Wed Sep 11 23:21:57 2002
***************
*** 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
--- 10,21 ----
  ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
  ;;    Vinicius Jose Latorre <address@hidden>
  ;; Keywords: wp, print, PostScript
! ;; Time-stamp: <2002/09/11 15:52:39 vinicius>
! ;; Version: 6.5.7
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst ps-print-version "6.5.7"
!   "ps-print.el, v 6.5.7 <2002/09/11 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
***************
*** 1514,1520 ****
      (cond ((string-match "XEmacs" emacs-version) 'xemacs)
          ((string-match "Lucid" emacs-version) 'lucid)
          ((string-match "Epoch" emacs-version) 'epoch)
!         (t 'emacs))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 1514,1545 ----
      (cond ((string-match "XEmacs" emacs-version) 'xemacs)
          ((string-match "Lucid" emacs-version) 'lucid)
          ((string-match "Epoch" emacs-version) 'epoch)
!         (t 'emacs)))
! 
!   (or (memq ps-print-emacs-type '(lucid xemacs))
!       (require 'faces))                       ; face-font, face-underline-p,
!                                       ; x-font-regexp
! 
!   (defun ps-xemacs-color-name (color)
!     (if (ps-x-color-specifier-p color)
!       (ps-x-color-name color)
!       color))
! 
! 
!   (cond ((eq ps-print-emacs-type 'emacs) ; emacs
!        (defvar mark-active nil)
!        (defun ps-mark-active-p ()
!          mark-active)
!        (defalias 'ps-face-foreground-name 'face-foreground)
!        (defalias 'ps-face-background-name 'face-background)
!        )
!       (t                              ; xemacs, lucid, epoch
!        (defalias 'ps-mark-active-p 'region-active-p)
!        (defun ps-face-foreground-name (face)
!          (ps-xemacs-color-name (face-foreground face)))
!        (defun ps-face-background-name (face)
!          (ps-xemacs-color-name (face-background face)))
!        )))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 2866,2874 ****
  ;;                widget to work.
  ;;;###autoload
  (defcustom ps-print-color-p
!   (or (and (fboundp 'color-values)    ; Emacs
!          (ps-e-color-values "Green"))
!       (fboundp 'x-color-values)               ; Emacs
        (fboundp 'color-instance-rgb-components))
                                        ; XEmacs
    "*Specify how buffer's text color is printed.
--- 2891,2897 ----
  ;;                widget to work.
  ;;;###autoload
  (defcustom ps-print-color-p
!   (or (fboundp 'x-color-values)               ; Emacs
        (fboundp 'color-instance-rgb-components))
                                        ; XEmacs
    "*Specify how buffer's text color is printed.
***************
*** 2890,2896 ****
                 (const :tag "Print Black/White Color" black-white))
    :group 'ps-print-color)
  
! (defcustom ps-default-fg '(0.0 0.0 0.0)
    "*RGB values of the default foreground color.  Defaults to black."
    :type '(choice :menu-tag "Default Foreground Gray/Color"
                 :tag "Default Foreground Gray/Color"
--- 2913,2920 ----
                 (const :tag "Print Black/White Color" black-white))
    :group 'ps-print-color)
  
! (defcustom ps-default-fg (or (ps-face-foreground-name 'default)
!                            '(0.0 0.0 0.0)) ; black
    "*RGB values of the default foreground color.  Defaults to black."
    :type '(choice :menu-tag "Default Foreground Gray/Color"
                 :tag "Default Foreground Gray/Color"
***************
*** 2902,2908 ****
                       (number :tag "Blue")))
    :group 'ps-print-color)
  
! (defcustom ps-default-bg '(1.0 1.0 1.0)
    "*RGB values of the default background color.  Defaults to white."
    :type '(choice :menu-tag "Default Background Gray/Color"
                 :tag "Default Background Gray/Color"
--- 2926,2933 ----
                       (number :tag "Blue")))
    :group 'ps-print-color)
  
! (defcustom ps-default-bg (or (ps-face-background-name 'default)
!                            '(1.0 1.0 1.0)) ; white
    "*RGB values of the default background color.  Defaults to white."
    :type '(choice :menu-tag "Default Background Gray/Color"
                 :tag "Default Background Gray/Color"
***************
*** 3617,3629 ****
  
  
  (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
  
  
    ;; Return t if the device (which can be changed during an emacs session)
--- 3642,3652 ----
  
  
  (eval-and-compile
!   (and (memq ps-print-emacs-type '(lucid 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)))
!        (setq ps-print-color-p nil))
  
  
    ;; Return t if the device (which can be changed during an emacs session)
***************
*** 3664,3674 ****
           (case-fold-search t))
        (and kind-spec (string-match kind-regex kind-spec))))
  
-   (defun ps-xemacs-color-name (color)
-     (if (ps-x-color-specifier-p color)
-       (ps-x-color-name color)
-       color))
- 
    (cond ((eq ps-print-emacs-type 'emacs) ; emacs
  
         (defun ps-color-values (x-color)
--- 3687,3692 ----
***************
*** 3680,3688 ****
            (t
             (error "No available function to determine X color values"))))
  
-        (defalias 'ps-face-foreground-name 'face-foreground)
-        (defalias 'ps-face-background-name 'face-background)
- 
         (defun ps-face-bold-p (face)
           (or (ps-e-face-bold-p face)
               (memq face ps-bold-faces)))
--- 3698,3703 ----
***************
*** 3691,3699 ****
           (or (ps-e-face-italic-p face)
               (memq face ps-italic-faces)))
         )
!                                       ; xemacs
!                                       ; lucid
!       (t                              ; epoch
  
         ;; to avoid XEmacs compilation gripes
         (defvar coding-system-for-write   nil)
--- 3706,3713 ----
           (or (ps-e-face-italic-p face)
               (memq face ps-italic-faces)))
         )
! 
!       (t                              ; xemacs, lucid, epoch
  
         ;; to avoid XEmacs compilation gripes
         (defvar coding-system-for-write   nil)
***************
*** 3718,3729 ****
              (t
               (error "No available function to determine X color values")))))
  
-        (defun ps-face-foreground-name (face)
-          (ps-xemacs-color-name (face-foreground face)))
- 
-        (defun ps-face-background-name (face)
-          (ps-xemacs-color-name (face-background face)))
- 
         (defun ps-face-bold-p (face)
           (or (ps-xemacs-face-kind-p face 'WEIGHT_NAME "bold\\|demibold")
               (memq face ps-bold-faces))) ; Kludge-compatible
--- 3732,3737 ----
***************
*** 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)))
  
--- 4438,4444 ----
  
  
  (defun ps-print-preprint-region (prefix-arg)
!   (or (ps-mark-active-p)
        (error "The mark is not set now"))
    (list (point) (mark) (ps-print-preprint prefix-arg)))