Applied this patch from Eli Zaretskii. Pretty much taking on faith

that it works, because I can't build the 20.6 raw tree...

2000-05-25  Eli Zaretskii  <eliz@is.elta.co.il>

	* bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
	(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames):
	Call display-color-p and display-mouse-p instead of looking at
	window-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83b67478e9fa3811724992dabdc22b891fe9c55c..901c68c23bb236b518d927e30f848aa4cbfe66af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
+       (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames):
+       Call display-color-p and display-mouse-p instead of looking at
+       window-system.
+
 2000-06-06  Dave Love  <fx@gnu.org>
 
        * image.el (find-image): Doc fix.  Return nil if image not found.

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b6e084d68983a3c6e8ad9f34a2160744fed3a7ab..1aaefcba15a14d4fa933400b73c7c2272a456c7a 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1175,7 +1175,7 @@ minibuffer history list `bookmark-history'."
   (let ((start (point)))
     (prog1
        (insert (bookmark-location bookmark)) ; *Return this line*
-      (if window-system
+      (if (and (display-color-p) (display-mouse-p))
          (put-text-property start 
                             (save-excursion (re-search-backward
                                              "[^ \t]")
@@ -1561,7 +1561,7 @@ deletion, or > if it is flagged for displaying."
            (insert "  "))
         (let ((start (point)))
           (insert (bookmark-name-from-full-record full-record))
-          (if window-system
+          (if (and (display-color-p) (display-mouse-p))
               (put-text-property start 
                                  (save-excursion (re-search-backward
                                                   "[^ \t]")
@@ -1657,7 +1657,7 @@ Optional argument SHOW means show them unconditionally."
              (let ((start (save-excursion (end-of-line) (point))))
                (move-to-column bookmark-bmenu-file-column t)
                ;; Strip off `mouse-face' from the white spaces region.
-               (if window-system
+               (if (and (display-color-p) (display-mouse-p))
                    (remove-text-properties start (point)
                                            '(mouse-face))))
              (delete-region (point) (progn (end-of-line) (point)))
@@ -1688,7 +1688,7 @@ Optional argument SHOW means show them unconditionally."
                 (bookmark-kill-line)
                (let ((start (point)))
                  (insert (car bookmark-bmenu-hidden-bookmarks))
-                 (if window-system
+                 (if (and (display-color-p) (display-mouse-p))
                      (put-text-property start 
                                         (save-excursion (re-search-backward
                                                          "[^ \t]")