andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* mwheel.el (mwheel-scroll): Call deactivate-mark at the right point.

Browse source 
Fixes: debbugs:9623
This commit is contained in:
Chong Yidong 2012-03-24 19:05:39 +08:00
parent 8ed7952375
commit f06e2758ba
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-24 Chong Yidong <cyd@gnu.org>
* mwheel.el (mwheel-scroll): Call deactivate-mark at the right
point (Bug#9623).
2012-03-23 Stefan Monnier <monnier@iro.umontreal.ca>
* newcomment.el (comment-choose-indent): No space after BOL.

9
lisp/mwheel.el
View file

@ -232,12 +232,17 @@ This should only be bound to mouse buttons 4 and 5."
(end-of-buffer (while t (funcall mwheel-scroll-up-function)))))
(t (error "Bad binding in mwheel-scroll"))))
(if curwin (select-window curwin)))
;; If there is a temporarily active region, deactivate it iff
;; If there is a temporarily active region, deactivate it if
;; scrolling moves point.
(when opoint
(with-current-buffer buffer
(when (/= opoint (point))
(deactivate-mark)))))
;; Call `deactivate-mark' at the original position, so that
;; the original region is saved to the X selection.
(let ((newpoint (point)))
(goto-char opoint)
(deactivate-mark)
(goto-char newpoint))))))
(when (and mouse-wheel-click-event mouse-wheel-inhibit-click-time)
(if mwheel-inhibit-click-event-timer
(cancel-timer mwheel-inhibit-click-event-timer)