[Emacs-diffs] trunk r116065: * lisp/term/common-win.el (saved-region-selection): Defvar it.

[Jan D.]

------------------------------------------------------------
revno: 116065
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16382
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2014-01-18 16:11:03 +0100
message:
  * lisp/term/common-win.el (saved-region-selection): Defvar it.
  (x-select-text): Set saved-region-selection.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/common-win.el        
commonwin.el-20091113204419-o5vbwnq5f7feedwu-8752

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-18 01:29:25 +0000
+++ b/lisp/ChangeLog    2014-01-18 15:11:03 +0000
@@ -1,3 +1,8 @@
+2014-01-18  Jan Djärv  <address@hidden>
+
+       * term/common-win.el (saved-region-selection): Defvar it.
+       (x-select-text): Set saved-region-selection (Bug#16382).
+
 2014-01-18  Glenn Morris  <address@hidden>
 
        * emacs-lisp/authors.el (authors-aliases)

=== modified file 'lisp/term/common-win.el'
--- a/lisp/term/common-win.el   2014-01-01 07:43:34 +0000
+++ b/lisp/term/common-win.el   2014-01-18 15:11:03 +0000
@@ -47,6 +47,7 @@
 (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 @@
             (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))))))