[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102071: Reduce duplicate definitions
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102071: Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2. |
Date: |
Sat, 23 Oct 2010 18:57:21 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102071
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 18:57:21 -0700
message:
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.
modified:
lisp/ChangeLog
lisp/term/common-win.el
lisp/term/x-win.el
lisp/w32-vars.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-24 01:48:39 +0000
+++ b/lisp/ChangeLog 2010-10-24 01:57:21 +0000
@@ -1,5 +1,9 @@
2010-10-24 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/term/common-win.el'
--- a/lisp/term/common-win.el 2010-06-12 17:12:15 +0000
+++ b/lisp/term/common-win.el 2010-10-24 01:57:21 +0000
@@ -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 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
=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el 2010-10-23 20:43:59 +0000
+++ b/lisp/term/x-win.el 2010-10-24 01:57:21 +0000
@@ -1206,17 +1206,6 @@
"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
=== modified file 'lisp/w32-vars.el'
--- a/lisp/w32-vars.el 2010-10-23 20:40:46 +0000
+++ b/lisp/w32-vars.el 2010-10-24 01:57:21 +0000
@@ -148,16 +148,6 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102071: Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2.,
Glenn Morris <=