From: Tino Calancha Date: Tue, 17 Oct 2017 07:20:08 +0000 (+0900) Subject: Dont update primary selection with winner-undo X-Git-Tag: emacs-26.0.91~533 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c3e6f1ddc;p=emacs.git Dont update primary selection with winner-undo * lisp/winner.el (winner-set): Dont update primary selection when select-enable-primary is non-nil (Bug#28631). Co-authored-by: Noam Postavsky --- diff --git a/lisp/winner.el b/lisp/winner.el index 61ea4d40e7b..6bc27484a79 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -304,12 +304,15 @@ You may want to include buffer names such as *Help*, *Apropos*, (push win xwins))) ; delete this window ;; Restore marks - (save-current-buffer - (cl-loop for buf in buffers - for entry = (cadr (assq buf winner-point-alist)) - do (progn (set-buffer buf) - (set-mark (car entry)) - (setf (winner-active-region) (cdr entry))))) + ;; `winner-undo' shouldn't update the selection (Bug#28631) when + ;; select-enable-primary is non-nil. + (unless select-enable-primary + (save-current-buffer + (cl-loop for buf in buffers + for entry = (cadr (assq buf winner-point-alist)) + do (progn (set-buffer buf) + (set-mark (car entry)) + (setf (winner-active-region) (cdr entry)))))) ;; Delete windows, whose buffers are dead or boring. ;; Return t if this is still a possible configuration. (or (null xwins)