From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 9 Oct 2021 06:48:34 +0000 (+0200)
Subject: Remove duplicate definition of x-display-color-p
X-Git-Tag: emacs-29.0.90~3671^2~621^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f35246db1934fa06c96ed8533641a55c899b7a01;p=emacs.git

Remove duplicate definition of x-display-color-p

* lisp/emulation/viper-init.el (x-display-color-p): Remove duplicate
definition.  This would just overwrite the alias defined in faces.el.
---

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index a170d677d2c..e3790b74534 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -44,11 +44,6 @@
 
 (define-obsolete-function-alias 'viper-device-type #'window-system "27.1")
 
-(defun x-display-color-p ()
-  (condition-case nil
-      (display-color-p)
-    (error nil)))
-
 ;; in XEmacs: device-type is tty on tty and stream in batch.
 (defun viper-window-display-p ()
   (and window-system (not (memq window-system '(tty stream pc)))))