(highlight-changes-mode): Ask about color or

grayscale support, not about window-system.

2 files changed, 24 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36a82f0268e..d2bc3c44f8f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,26 @@
 2000-05-25  Eli Zaretskii  <eliz@is.elta.co.il>
 
+        * hilit-chg.el (highlight-changes-mode): Ask about color or
+        grayscale support, not about window-system.
+
+        * ffap.el (ffap-menu-text-plist): Use display-mouse-p, not
+        window-system.
+        (ffap-highlight): Always default to t.
+
+        * emacs-lisp/edebug.el (edebug-emacs-19-specific): Call
+        display-popup-menus-p instead of looking at window-system.
+
+        * disp-table.el (standard-display-g1, standard-display-graphic):
+        Only refuse to use string glyphs on X and MS-Windows.
+
+        * avoid.el: Remove window-system from commentary, suggest to use
+        display-*-p instead.
+
+        * apropos.el (apropos-print): Use display-mouse-p instead of
+        window-system.
+
+2000-05-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
         * international/codepage.el (cp-decoding-vector-for-codepage):
         Fill up unsupported characters with their own codes.  From Kenichi
         Handa.
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index c7a0586aa44..d254cb8de6c 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -684,7 +684,8 @@ highlight-changes-toggle-hook - when entering active or passive state
 highlight-changes-disable-hook - when turning off Highlight Changes mode.
 "
   (interactive "P")
-  (if window-system
+  (if (or (display-color-p)
+          (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
       (let ((was-on highlight-changes-mode)
             (new-highlight-changes-mode
              (cond
@@ -717,7 +718,7 @@ highlight-changes-disable-hook - when turning off Highlight Changes mode.
           (run-hooks 'highlight-changes-disable-hook)
           (hilit-chg-clear))
         )
-    (message "Highlight Changes mode only works when using a window system"))
+    (message "Highlight Changes mode requires color or grayscale display"))
   )