From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 1 Sep 1996 02:42:04 +0000 (+0000)
Subject: (mouse-show-mark): Detect loss of selection
X-Git-Tag: emacs-20.1~3928
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33d79bad63e2f3dfafc783730ba4c3b6e75f8b94;p=emacs.git

(mouse-show-mark): Detect loss of selection
while we are showing it highlighted.
---

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 3a2ad550ead..cbddd2cacdd 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -743,22 +743,32 @@ If DIR is positive skip forward; if negative, skip backward."
     (if window-system
 	(let ((inhibit-quit t)
 	      (echo-keystrokes 0)
-	      event events key)
+	      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))
-	  (while (progn (setq event (read-event))
-			(setq events (append events (list event)))
-			(setq key (apply 'vector events))
-			(and (memq 'down (event-modifiers event))
-			     (not (key-binding key))
-			     (not (member key mouse-region-delete-keys))
-			     (not (mouse-undouble-last-event events)))))
-	  ;; 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)))
+	  (catch 'mouse-show-mark
+	    (while (progn (setq event (read-event))
+			  (setq events (append events (list event)))
+			  (setq key (apply 'vector events))
+			  (and (memq 'down (event-modifiers event))
+			       (not (key-binding key))
+			       (not (member key mouse-region-delete-keys))
+			       (not (mouse-undouble-last-event events))))))
+	  ;; 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))
       (save-excursion