edit-utils -- Remove GNU-only min-colors face spec.

	* xemacs-packages/edit-utils/ido.el (ido-subdir, ido-indicator):
	Comment out use of `min-color' face spec, it's Emacs 22+ only.

	* xemacs-packages/edit-utils/which-func.el (which-func): Ditto.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/xemacs-packages/edit-utils/ido.el b/xemacs-packages/edit-utils/ido.el
index ec933ec..da7c838 100644 (file)
--- a/xemacs-packages/edit-utils/ido.el
+++ b/xemacs-packages/edit-utils/ido.el
@@ -803,8 +803,8 @@ subdirs in the alternatives."
   "Face used by ido for highlighting only match."
   :group 'ido)
 
-(defface ido-subdir  '((((min-colors 88) (class color))
-                             (:foreground "red1"))
+(defface ido-subdir  '(;(((min-colors 88) (class color)) ; Emacs 22+ only
+                       ;      (:foreground "red1"))
                            (((class color))
                              (:foreground "red"))
                             (t (:underline t)))
@@ -816,10 +816,10 @@ subdirs in the alternatives."
   :version "24.1"
   :group 'ido)
 
-(defface ido-indicator  '((((min-colors 88) (class color))
-                               (:foreground "yellow1"
-                                :background "red1"
-                                :width condensed))
+(defface ido-indicator  '(;(((min-colors 88) (class color)) ; Emacs 22+ only
+                         ;     (:foreground "yellow1"
+                         ;      :background "red1"
+                         ;      :width condensed))
                               (((class color))
                                (:foreground "yellow"
                                 :background "red"

diff --git a/xemacs-packages/edit-utils/which-func.el b/xemacs-packages/edit-utils/which-func.el
index 6715949..8a9bd6f 100644 (file)
--- a/xemacs-packages/edit-utils/which-func.el
+++ b/xemacs-packages/edit-utils/which-func.el
@@ -122,8 +122,8 @@ Zero means compute the Imenu menu regardless of size."
   '(;; The default mode-line face on a high-color display is a relatively
     ;; light color ("grey75"), and only the light-background variant of
     ;; `font-lock-function-name-face' is visible against it.
-    (((class color) (min-colors 88) (background light))
-     (:inherit font-lock-function-name-face))
+    ; (((class color) (min-colors 88) (background light)) ; Emacs 22+ only
+    ;  (:inherit font-lock-function-name-face))
     ;; The default mode-line face on other display types is inverse-video;
     ;; it seems that only in the dark-background case is
     ;; `font-lock-function-name-face' visible against it.
@@ -133,8 +133,8 @@ Zero means compute the Imenu menu regardless of size."
      (:inherit font-lock-function-name-face))
     ;; If none of the above cases, use an explicit color chosen to contrast
     ;; well with the default mode-line face.
-    (((class color) (min-colors 88) (background dark))
-     (:foreground "Blue1"))
+    ; (((class color) (min-colors 88) (background dark)) ; Emacs 22+ only
+    ;  (:foreground "Blue1"))
     (((background dark))
      (:foreground "Blue1"))
     (t