procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes: debbugs:18939

Browse source 
* simple.el (deactivate-mark): Only modify PRIMARY if we own PRIMARY.
This commit is contained in:
Jan D 2015-03-22 19:31:46 +01:00
parent a4ff05a217
commit c3c4b758c6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-22 Jan Djärv <jan.h.d@swipnet.se>
* simple.el (deactivate-mark): Only modify PRIMARY if we own
PRIMARY (Bug#18939).
2015-03-22 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/debug.el (debug): Don't try using "previous" window

3
lisp/simple.el
View file

@ -4420,7 +4420,8 @@ run `deactivate-mark-hook'."
;; the region prior to the last command modifying the buffer.
;; Set the selection to that, or to the current region.
(cond (saved-region-selection
(x-set-selection 'PRIMARY saved-region-selection)
(if (x-selection-owner-p 'PRIMARY)
(x-set-selection 'PRIMARY saved-region-selection))
(setq saved-region-selection nil))
;; If another program has acquired the selection, region
;; deactivation should not clobber it (Bug#11772).