diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/term/common-win.el | 12 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 11 | ||||
| -rw-r--r-- | lisp/w32-vars.el | 10 |
4 files changed, 15 insertions, 22 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24fe1463543..81ad3afecd9 100644 --- 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 25ba41a23c2..832dde1d8a1 100644 --- 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 f79942ed33d..c39332cc12b 100644 --- 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 0a6e79275a8..80cdfb57129 100644 --- 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 |