* lisp/term/common-win.el (saved-region-selection): Defvar it.

(x-select-text): Set saved-region-selection.

Fixes: debbugs:16382

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6faac565f82acdb431cfa22d229b9f2cdecdb8ff..83d61f16ce6e75b9b51a57c42e40fca7b5a39108 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * term/common-win.el (saved-region-selection): Defvar it.
+       (x-select-text): Set saved-region-selection (Bug#16382).
+
 2014-01-18  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/authors.el (authors-aliases)

diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 36417491c2e9354401f04aea7bf0accf04d9cd54..31aa5ffdc429c4a2a7a35137c450fc010a1d0e68 100644 (file)
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -47,6 +47,7 @@ This variable is not used by the Nextstep port."
 (defvar x-select-enable-primary)       ; x-win.el
 (defvar x-last-selected-text-primary)
 (defvar x-last-selected-text-clipboard)
+(defvar saved-region-selection)        ; simple.el
 
 (defun x-select-text (text)
   "Select TEXT, a string, according to the window system.
@@ -77,6 +78,10 @@ is not used)."
             (x-set-selection 'PRIMARY text)
             (setq x-last-selected-text-primary text))
           (when x-select-enable-clipboard
+            ;; When cutting, the selection is cleared and PRIMARY set to
+            ;; the empty string.  Prevent that, PRIMARY should not be reset
+            ;; by cut (Bug#16382).
+            (setq saved-region-selection text)
             (x-set-selection 'CLIPBOARD text)
             (setq x-last-selected-text-clipboard text))))))