# HG changeset patch
# User Karl Fogel <kfogel@red-bean.com>
# Date 960331284 0
# Node ID 0797cad76554c41877fa2a8e48c5edd58504c89e
# Parent  b96b18a0f34bc77571e62cb90532b16a27781e3c
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 -r b96b18a0f34b -r 0797cad76554 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 06 20:03:57 2000 +0000
+++ b/lisp/ChangeLog	Tue Jun 06 22:41:24 2000 +0000
@@ -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 -r b96b18a0f34b -r 0797cad76554 lisp/bookmark.el
--- a/lisp/bookmark.el	Tue Jun 06 20:03:57 2000 +0000
+++ b/lisp/bookmark.el	Tue Jun 06 22:41:24 2000 +0000
@@ -1175,7 +1175,7 @@
   (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 @@
            (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 @@
 	      (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 @@
                 (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]")