Don't make faces depend on window-system.

2 files changed, 50 insertions, 48 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6e2c1ed442..0c4a5902409 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-18  Vasily Korytov  <deskpot@myrealbox.com>  (tiny change)
+
+        * progmodes/cperl-mode.el: Don't make faces depend on window-system.
+
 2003-01-18  Markus Rost  <rost@math.ohio-state.edu>
 
         * cus-edit.el (customize-changed-options): Undo last doc change.
@@ -47,7 +51,7 @@
 
 2003-01-15  Deepak Goel  <deego@gnufans.org>
 
-        * calc/README: Add new maintainer. 
+        * calc/README: Add new maintainer.
 
         * calc/*: Ditto.
 
@@ -90,7 +94,7 @@
 
 2003-01-14  Kim F. Storm  <storm@cua.dk>
 
-        * ido.el (ido-read-internal, ido-file-internal) 
+        * ido.el (ido-read-internal, ido-file-internal)
         (ido-copy-current-file-name, ido-wide-find-dirs-or-files):
         Don't use `path' as name of local variables holding a file name.
 
@@ -109,7 +113,7 @@
 
 2003-01-14  John Paul Wallington  <jpw@shootybangbang.com>
 
-        * apropos.el (apropos): Restore autoload cookie.  Fix typo in 
+        * apropos.el (apropos): Restore autoload cookie.  Fix typo in
         "error retrieving function documentation" output.
 
 2003-01-14  Kim F. Storm  <storm@cua.dk>
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 49bd228e280..86147a2ca73 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -544,51 +544,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" :slant italic :underline t))
-          (((class grayscale) (background dark))
-           (:foreground "Gray80" :slant italic :underline t :weight bold))
-          (((class color) (background light))
-           (:foreground "chartreuse3"))
-          (((class color) (background dark))
-           (:foreground ,cperl-dark-foreground))
-          (t (:weight bold :underline t)))
-        "Font Lock mode face used to highlight array names."
-        :group 'cperl-faces)
-
-      (defface cperl-array-face
-        `((((class grayscale) (background light))
-           (:background "Gray90" :weight bold))
-          (((class grayscale) (background dark))
-           (:foreground "Gray80" :weight bold))
-          (((class color) (background light))
-           (:foreground "Blue" :background "lightyellow2" :weight bold))
-          (((class color) (background dark))
-           (:foreground "yellow" :background ,cperl-dark-background :weight bold))
-          (t (:weight bold)))
-        "Font Lock mode face used to highlight array names."
-        :group 'cperl-faces)
-
-      (defface cperl-hash-face
-        `((((class grayscale) (background light))
-           (:background "Gray90" :weight bold :slant italic))
-          (((class grayscale) (background dark))
-           (:foreground "Gray80" :weight bold :slant italic))
-          (((class color) (background light))
-           (:foreground "Red" :background "lightyellow2" :weight bold :slant italic))
-          (((class color) (background dark))
-           (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic))
-          (t (:weight bold :slant italic)))
-        "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" :slant italic :underline t))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :slant italic :underline t :weight bold))
+    (((class color) (background light))
+     (:foreground "chartreuse3"))
+    (((class color) (background dark))
+     (:foreground ,cperl-dark-foreground))
+    (t (:weight bold :underline t)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-array-face
+  `((((class grayscale) (background light))
+     (:background "Gray90" :weight bold))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :weight bold))
+    (((class color) (background light))
+     (:foreground "Blue" :background "lightyellow2" :weight bold))
+    (((class color) (background dark))
+     (:foreground "yellow" :background ,cperl-dark-background :weight bold))
+    (t (:weight bold)))
+  "Font Lock mode face used to highlight array names."
+  :group 'cperl-faces)
+
+(defface cperl-hash-face
+  `((((class grayscale) (background light))
+     (:background "Gray90" :weight bold :slant italic))
+    (((class grayscale) (background dark))
+     (:foreground "Gray80" :weight bold :slant italic))
+    (((class color) (background light))
+     (:foreground "Red" :background "lightyellow2" :weight bold :slant italic))
+    (((class color) (background dark))
+     (:foreground "Red" :background ,cperl-dark-background :weight bold :slant italic))
+    (t (:weight bold :slant italic)))
+  "Font Lock mode face used to highlight hash names."
+  :group 'cperl-faces)