Commit 8aa0f263 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 46710489
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.
 
......
......@@ -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
......@@ -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
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment