[Emacs-diffs] emacs-26 2c3e6f1: Dont update primary selection with winner-undo

[Tino Calancha]

branch: emacs-26
commit 2c3e6f1ddc90335249f1a7f56f5f7b377c873fb7
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    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 <address@hidden>
---
 lisp/winner.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lisp/winner.el b/lisp/winner.el
index 61ea4d4..6bc2748 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)