Commits

Anonymous committed 8f090f5

2002-08-27 Ville Skyttä <ville.skytta@xemacs.org>

* ps-print.el: Check emacs-major-version in addition to
emacs-minor-version when deciding stuff at compile time.
This disables setq'ing ps-print-color-p to nil based on
wrong information, as well as defun's ps-color-device
as obviously meant on XEmacs >= 20.
(ps-print-color-p): Add autoload cookie to make
"Options->Printing->Color Printing" widget work.

  • Participants
  • Parent commits 27ac89f

Comments (0)

Files changed (2)

+2002-08-27  Ville Skyttä  <ville.skytta@xemacs.org>
+
+	* ps-print.el: Check emacs-major-version in addition to
+	emacs-minor-version when deciding stuff at compile time.
+	This disables setq'ing ps-print-color-p to nil based on
+	wrong information, as well as defun's ps-color-device
+	as obviously meant on XEmacs >= 20.
+	(ps-print-color-p): Add autoload cookie to make
+	"Options->Printing->Color Printing" widget work.
+
 2002-08-05  Rendhalver [Peter Brown]  <rendhalver@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.07 released.
 ;;; 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"))
 
 (eval-and-compile
   (if (memq ps-print-emacs-type '(lucid xemacs))
-      (if (< emacs-minor-version 12)
+      ;; 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
   ;; 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
+	      ;; 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)))