summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-10-23 13:40:46 -0700
committerGlenn Morris <rgm@gnu.org>2010-10-23 13:40:46 -0700
commit6f748f70b6c96f5dc7b0a80a3fcead98be5152cb (patch)
tree3ef1538ef0e5250bc485b7398032ea9b78647cb2 /lisp/term
parent7aa93795cbf073ff3b4a20639ff2a4e34d9716e5 (diff)
Make all 3 copies of x-select-enable-clipboard have the same doc.
* lisp/term/pc-win.el (x-select-enable-clipboard): * lisp/term/x-win.el (x-select-enable-clipboard): * lisp/w32-vars.el (x-select-enable-clipboard): Make doc-strings identical.
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/pc-win.el11
-rw-r--r--lisp/term/x-win.el7
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 93f4ea436c3..16e7e8f88f0 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,7 +1,7 @@
;;; pc-win.el --- setup support for `PC windows' (whatever that is)
-;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Maintainer: FSF
@@ -203,9 +203,9 @@ the operating system.")
"Non-nil means cutting and pasting uses the clipboard.
This is in addition to, but in preference to, the primary selection.
-On MS-Windows, this is non-nil by default, since Windows does not
-support other types of selections. \(The primary selection that is
-set by Emacs is not accessible to other programs on Windows.\)"
+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)
@@ -408,5 +408,4 @@ Errors out because it is not supposed to be called, ever."
(provide 'pc-win)
-;; arch-tag: 5cbdb455-b495-427b-95d0-e417d77d00b4
;;; pc-win.el ends here
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 1950bef19be..5f5336ab2bf 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1208,7 +1208,11 @@ 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."
+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")
@@ -1640,5 +1644,4 @@ This uses `icon-map-list' to map icon file names to stock icon names."
(provide 'x-win)
-;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
;;; x-win.el ends here