Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.

* lisp/w32-vars.el (x-select-enable-clipboard):
* lisp/term/x-win.el (x-select-enable-clipboard): Move to common-win.
* lisp/term/common-win.el (x-select-enable-clipboard): Move here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24fe14635439a046e65f3aa4de8fb935fa9d3225..81ad3afecd9e548a94c7592d4cf29402e1efce1e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
+       * w32-vars.el (x-select-enable-clipboard):
+       * term/x-win.el (x-select-enable-clipboard): Move to common-win.
+       * term/common-win.el (x-select-enable-clipboard): Move here.
+
        * term/tty-colors.el (tty-defined-color-alist): Remove duplicate
        definition of C variable.
 

diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 25ba41a23c27a1c4c4a1e59e7fb260cbaacc1290..832dde1d8a16a87a869edcb889657c39ba62cd0f 100644 (file)
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -25,6 +25,17 @@
 
 ;;; Code:
 
+(defcustom x-select-enable-clipboard t
+  "Non-nil means cutting and pasting uses the clipboard.
+This is in addition to, but in preference to, the primary selection.
+
+Note that MS-Windows does not support selection types other than the
+clipboard.   \(The primary selection that is set by Emacs is not
+accessible to other programs on MS-Windows.\)"
+  :type 'boolean
+  :group 'killing
+  ;; The GNU/Linux version changed in 24.1, the MS-Windows version did not.
+  :version "24.1")
 
 (defvar x-invocation-args)
 
@@ -371,5 +382,4 @@ For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
 For Nextstep, this is a list of non-PANTONE colors returned by
 the operating system.")
 
-;; arch-tag: 2a128601-99cc-401e-9dff-0ee6a36102ef
 ;;; common-win.el ends here

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index f79942ed33df3e586b0873db8ea298b597e22149..c39332cc12bade357564ad923296abc7a7800953 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1206,17 +1206,6 @@ pasted text.")
   "The value of the PRIMARY X selection last time we selected or
 pasted text.")
 
-(defcustom x-select-enable-clipboard t
-  "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to, but in preference to, the primary selection.
-
-Note that MS-Windows does not support selection types other than the
-clipboard.   \(The primary selection that is set by Emacs is not
-accessible to other programs on MS-Windows.\)"
-  :type 'boolean
-  :group 'killing
-  :version "24.1")
-
 (defcustom x-select-enable-primary nil
   "Non-nil means cutting and pasting uses the primary selection."
   :type 'boolean

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 0a6e79275a8d8125b4f778c0fce1f1734b61cb28..80cdfb57129efb756d5a5aa19c59fce89b1a6c19 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -148,16 +148,6 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
                      (string :tag "Font")))))))
     :group 'w32)
 
-(defcustom x-select-enable-clipboard t
-  "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to, but in preference to, the primary selection.
-
-Note that MS-Windows does not support selection types other than the
-clipboard.   \(The primary selection that is set by Emacs is not
-accessible to other programs on MS-Windows.\)"
-  :type 'boolean
-  :group 'killing)
-
 (provide 'w32-vars)
 
 ;;; w32-vars.el ends here