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

grayscale support, not about window-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36a82f0268e5dcc5a2d1a42416376870c87aac30..d2bc3c44f8f82e4587d22ba6a358fceac46d0c32 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+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):

diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index c7a0586aa44362f145ec30ff91f36c1e362e09b7..d254cb8de6c76b7c0c03829b9f591be80ad46b63 100644 (file)
--- 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"))
   )