Don't make faces depend on window-system.

2 files changed, 47 insertions, 45 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa675af8440..66c44fb52e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-20  Vasily Korytov  <deskpot@myrealbox.com>  (tiny change)
+
+	* progmodes/cperl-mode.el: Don't make faces depend on window-system.
+
 2003-01-17  Francesco Potort,Al(B  <pot@gnu.org>
 
 	* Version 21.3 released.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 49b736606a2..f74ba816568 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -516,51 +516,49 @@ when syntaxifying a chunk of buffer."
 				   (repeat symbol)))))
   :group 'cperl-faces)
 
-(if window-system
-    (progn
-      (defvar cperl-dark-background
-	(cperl-choose-color "navy" "os2blue" "darkgreen"))
-      (defvar cperl-dark-foreground
-	(cperl-choose-color "orchid1" "orange"))
-
-      (defface cperl-nonoverridable-face
-	`((((class grayscale) (background light))
-	   (:background "Gray90" :italic t :underline t))
-	  (((class grayscale) (background dark))
-	   (:foreground "Gray80" :italic t :underline t :bold t))
-	  (((class color) (background light))
-	   (:foreground "chartreuse3"))
-	  (((class color) (background dark))
-	   (:foreground ,cperl-dark-foreground))
-	  (t (:bold t :underline t)))
-	"Font Lock mode face used to highlight array names."
-	:group 'cperl-faces)
-
-      (defface cperl-array-face
-	`((((class grayscale) (background light))
-	   (:background "Gray90" :bold t))
-	  (((class grayscale) (background dark))
-	   (:foreground "Gray80" :bold t))
-	  (((class color) (background light))
-	   (:foreground "Blue" :background "lightyellow2" :bold t))
-	  (((class color) (background dark))
-	   (:foreground "yellow" :background ,cperl-dark-background :bold t))
-	  (t (:bold t)))
-	"Font Lock mode face used to highlight array names."
-	:group 'cperl-faces)
-
-      (defface cperl-hash-face
-	`((((class grayscale) (background light))
-	   (:background "Gray90" :bold t :italic t))
-	  (((class grayscale) (background dark))
-	   (:foreground "Gray80" :bold t :italic t))
-	  (((class color) (background light))
-	   (:foreground "Red" :background "lightyellow2" :bold t :italic t))
-	  (((class color) (background dark))
-	   (:foreground "Red" :background ,cperl-dark-background :bold t :italic t))
-	  (t (:bold t :italic t)))
-	"Font Lock mode face used to highlight hash names."
-	:group 'cperl-faces)))
+(defvar cperl-dark-background
+  (cperl-choose-color "navy" "os2blue" "darkgreen"))
+(defvar cperl-dark-foreground
+  (cperl-choose-color "orchid1" "orange"))
+
+(defface cperl-nonoverridable-face
+    `((((class grayscale) (background light))
+       (:background "Gray90" :italic t :underline t))
+      (((class grayscale) (background dark))
+       (:foreground "Gray80" :italic t :underline t :bold t))
+      (((class color) (background light))
+       (:foreground "chartreuse3"))
+      (((class color) (background dark))
+       (:foreground ,cperl-dark-foreground))
+      (t (:bold t :underline t)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-array-face
+    `((((class grayscale) (background light))
+       (:background "Gray90" :bold t))
+      (((class grayscale) (background dark))
+       (:foreground "Gray80" :bold t))
+      (((class color) (background light))
+       (:foreground "Blue" :background "lightyellow2" :bold t))
+      (((class color) (background dark))
+       (:foreground "yellow" :background ,cperl-dark-background :bold t))
+      (t (:bold t)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-hash-face
+    `((((class grayscale) (background light))
+       (:background "Gray90" :bold t :italic t))
+      (((class grayscale) (background dark))
+       (:foreground "Gray80" :bold t :italic t))
+      (((class color) (background light))
+       (:foreground "Red" :background "lightyellow2" :bold t :italic t))
+      (((class color) (background dark))
+       (:foreground "Red" :background ,cperl-dark-background :bold t :italic t))
+      (t (:bold t :italic t)))
+  "Font Lock mode face used to highlight hash names."
+  :group 'cperl-faces)