emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v


From: Richard M. Stallman
Subject: [Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v
Date: Tue, 25 Dec 2007 19:55:59 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/12/25 19:55:59

Index: x-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- x-win.el    22 Nov 2007 08:35:20 -0000      1.218
+++ x-win.el    25 Dec 2007 19:55:59 -0000      1.219
@@ -2173,6 +2173,11 @@
   :type 'boolean
   :group 'killing)
 
+(defcustom x-select-enable-primary t
+  "Non-nil means cutting and pasting uses the primary selection."
+  :type 'boolean
+  :group 'killing)
+
 (defun x-select-text (text &optional push)
   "Make TEXT, a string, the primary X selection.
 Also, set the value of X cut buffer 0, for backward compatibility
@@ -2194,8 +2199,9 @@
                  ;; ICCCM says cut buffer always contain ISO-Latin-1
                  (encode-coding-string text 'iso-latin-1))
            (x-set-cut-buffer x-last-selected-text-cut-encoded push)))
+    (when x-select-enable-primary
     (x-set-selection 'PRIMARY text)
-    (setq x-last-selected-text-primary text)
+      (setq x-last-selected-text-primary text))
     (when x-select-enable-clipboard
       (x-set-selection 'CLIPBOARD text)
       (setq x-last-selected-text-clipboard text))))
@@ -2341,6 +2347,7 @@
                 nil)
                (t (setq x-last-selected-text-clipboard clip-text)))))
 
+      (when x-select-enable-primary
       (setq primary-text (x-selection-value 'PRIMARY))
       ;; Check the PRIMARY selection for 'newness', is it different
       ;; from what we remebered them to be last time we did a
@@ -2356,7 +2363,7 @@
               (setq x-last-selected-text-primary primary-text)
               nil)
              (t
-              (setq x-last-selected-text-primary primary-text))))
+               (setq x-last-selected-text-primary primary-text)))))
 
       (setq cut-text (x-get-cut-buffer 0))
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]