[Emacs-diffs] Changes to emacs/lisp/emulation/viper-init.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-init.el
diff -c emacs/lisp/emulation/viper-init.el:1.27 
emacs/lisp/emulation/viper-init.el:1.28
*** emacs/lisp/emulation/viper-init.el:1.27     Mon Sep  1 15:45:23 2003
--- emacs/lisp/emulation/viper-init.el  Sat Feb 19 19:32:47 2005
***************
*** 70,75 ****
--- 70,85 ----
     window-system
     ))
  
+ (defun viper-color-display-p ()
+   (condition-case nil
+       (viper-cond-compile-for-xemacs-or-emacs
+        (eq (device-class (selected-device)) 'color) ; xemacs form
+        (if (fboundp 'display-color-p) ; emacs form
+          (display-color-p)
+        (x-display-color-p))
+       )
+     (error nil)))
+ 
  ;; in XEmacs: device-type is tty on tty and stream in batch.
  (defun viper-window-display-p ()
    (and (viper-device-type) (not (memq (viper-device-type) '(tty stream pc)))))
***************
*** 97,102 ****
--- 107,113 ----
  (defun viper-has-face-support-p ()
    (cond ((viper-window-display-p))
        (viper-force-faces)
+       ((viper-color-display-p))
        (viper-emacs-p (memq (viper-device-type) '(pc)))
        (viper-xemacs-p (memq (viper-device-type) '(tty pc)))))