From 1c9df23f8c7c2315348612493be0f3eb74411360 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 17 Aug 1996 16:56:19 +0000 Subject: [PATCH] (mouse-drag-region): Don't call mouse-set-region-1 if mark is gone or no longer active or if we changed buffers. --- lisp/mouse.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/mouse.el b/lisp/mouse.el index 7ffc98c7a9d..c10101bf64b 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -594,8 +594,15 @@ remains active. Otherwise, it remains until the next input event." (push-mark region-commencement t t) (goto-char region-termination) (copy-region-as-kill (point) (mark t)) - (mouse-show-mark) - (mouse-set-region-1)) + (let ((buffer (current-buffer))) + (mouse-show-mark) + ;; mouse-show-mark can call read-event, + ;; and that means the Emacs server could switch buffers + ;; under us. If that happened, + ;; avoid trying to use the region. + (and (mark t) mark-active + (eq buffer (current-buffer)) + (mouse-set-region-1)))) (goto-char (overlay-end mouse-drag-overlay)) (setq this-command 'mouse-set-point) (delete-overlay mouse-drag-overlay)))) -- 2.39.2