From f4b60fe63591318ac690b360ebf9a7dc5f50a695 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 5 Mar 2002 18:41:53 +0000
Subject: [PATCH] (mouse-show-mark): Remove the no-highlight alternative: all
 terminals now support highlighting of some kind.

---
 lisp/ChangeLog |  3 ++
 lisp/mouse.el  | 98 ++++++++++++++++++++++++--------------------------
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48c53ac4877..980f8171fed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-03-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
+	* mouse.el (mouse-show-mark): Remove the no-highlight alternative:
+	all terminals now support highlighting of some kind.
+
 	* language/european.el (mac-roman): Fix the safe-chars property.
 
 2002-03-05  Andre Spiegel  <spiegel@gnu.org>
diff --git a/lisp/mouse.el b/lisp/mouse.el
index f5e855f0920..f91707f1eea 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1007,57 +1007,53 @@ If DIR is positive skip forward; if negative, skip backward."
 (defun mouse-show-mark ()
   (if transient-mark-mode
       (delete-overlay mouse-drag-overlay)
-    (if (not (display-mouse-p))
-	(save-excursion
-	  (goto-char (mark t))
-	  (sit-for 1))
-      (let ((inhibit-quit t)
-	    (echo-keystrokes 0)
-	    event events key ignore
-	    x-lost-selection-hooks)
-	(add-hook 'x-lost-selection-hooks
-		  (lambda (seltype)
-		    (if (eq seltype 'PRIMARY)
-			(progn (setq ignore t)
-			       (throw 'mouse-show-mark t)))))
-	(move-overlay mouse-drag-overlay (point) (mark t))
-	(catch 'mouse-show-mark
-	  ;; In this loop, execute scroll bar and switch-frame events.
-	  ;; Also ignore down-events that are undefined.
-	  (while (progn (setq event (read-event))
-			(setq events (append events (list event)))
-			(setq key (apply 'vector events))
-			(or (and (consp event)
-				 (eq (car event) 'switch-frame))
-			    (and (consp event)
-				 (eq (posn-point (event-end event))
-				     'vertical-scroll-bar))
-			    (and (memq 'down (event-modifiers event))
-				 (not (key-binding key))
-				 (not (mouse-undouble-last-event events))
-				 (not (member key mouse-region-delete-keys)))))
-	    (and (consp event)
-		 (or (eq (car event) 'switch-frame)
-		     (eq (posn-point (event-end event))
-			 'vertical-scroll-bar))
-		 (let ((keys (vector 'vertical-scroll-bar event)))
-		   (and (key-binding keys)
-			(progn
-			  (call-interactively (key-binding keys)
-					      nil keys)
-			  (setq events nil)))))))
-	;; If we lost the selection, just turn off the highlighting.
-	(if ignore
-	    nil
-	  ;; For certain special keys, delete the region.
-	  (if (member key mouse-region-delete-keys)
-	      (delete-region (overlay-start mouse-drag-overlay)
-			     (overlay-end mouse-drag-overlay))
-	    ;; Otherwise, unread the key so it gets executed normally.
-	    (setq unread-command-events
-		  (nconc events unread-command-events))))
-	(setq quit-flag nil)
-	(delete-overlay mouse-drag-overlay)))))
+    (let ((inhibit-quit t)
+	  (echo-keystrokes 0)
+	  event events key ignore
+	  x-lost-selection-hooks)
+      (add-hook 'x-lost-selection-hooks
+		(lambda (seltype)
+		  (if (eq seltype 'PRIMARY)
+		      (progn (setq ignore t)
+			     (throw 'mouse-show-mark t)))))
+      (move-overlay mouse-drag-overlay (point) (mark t))
+      (catch 'mouse-show-mark
+	;; In this loop, execute scroll bar and switch-frame events.
+	;; Also ignore down-events that are undefined.
+	(while (progn (setq event (read-event))
+		      (setq events (append events (list event)))
+		      (setq key (apply 'vector events))
+		      (or (and (consp event)
+			       (eq (car event) 'switch-frame))
+			  (and (consp event)
+			       (eq (posn-point (event-end event))
+				   'vertical-scroll-bar))
+			  (and (memq 'down (event-modifiers event))
+			       (not (key-binding key))
+			       (not (mouse-undouble-last-event events))
+			       (not (member key mouse-region-delete-keys)))))
+	  (and (consp event)
+	       (or (eq (car event) 'switch-frame)
+		   (eq (posn-point (event-end event))
+		       'vertical-scroll-bar))
+	       (let ((keys (vector 'vertical-scroll-bar event)))
+		 (and (key-binding keys)
+		      (progn
+			(call-interactively (key-binding keys)
+					    nil keys)
+			(setq events nil)))))))
+      ;; If we lost the selection, just turn off the highlighting.
+      (if ignore
+	  nil
+	;; For certain special keys, delete the region.
+	(if (member key mouse-region-delete-keys)
+	    (delete-region (overlay-start mouse-drag-overlay)
+			   (overlay-end mouse-drag-overlay))
+	  ;; Otherwise, unread the key so it gets executed normally.
+	  (setq unread-command-events
+		(nconc events unread-command-events))))
+      (setq quit-flag nil)
+      (delete-overlay mouse-drag-overlay))))
 
 (defun mouse-set-mark (click)
   "Set mark at the position clicked on with the mouse.
-- 
2.39.2