summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2009-07-24 16:18:55 +0000
committerEli Zaretskii <eliz@gnu.org>2009-07-24 16:18:55 +0000
commitbd4f572c9e653f9a153c53b5ab29e3e5322af0a6 (patch)
treeb4ecf17613259b6c32b6ae08105439f4628b1f4e
parente1a5ba7399e0da833d660cb7aea7aac6850b9a1c (diff)
downloademacs-bd4f572c9e653f9a153c53b5ab29e3e5322af0a6.tar.gz
(x-colors, x-select-enable-clipboard): Doc fix.
-rw-r--r--lisp/term/common-win.el2
-rw-r--r--lisp/term/ns-win.el2
-rw-r--r--lisp/term/pc-win.el8
-rw-r--r--lisp/term/x-win.el6
4 files changed, 13 insertions, 5 deletions
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 4858e47d0ec..abf3afd1554 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -287,7 +287,7 @@ This function returns ARGS minus the arguments that have been processed."
"cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse"
"yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke"
"gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" )
- "List of available colors for graphical frames.
+ "List of basic colors available on color displays.
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.")
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index bca350311cd..bf8b00123f5 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1126,7 +1126,7 @@ On Nextstep, put TEXT in the pasteboard; PUSH is ignored."
(declare-function ns-list-colors "nsfns.m" (&optional frame))
(defvar x-colors (ns-list-colors)
- "List of available colors for graphical frames.
+ "List of basic colors available on color displays.
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.")
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 4f4cb568a3e..39bf5f17254 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -185,7 +185,7 @@ created."
On X, the display name of individual X frames is recorded in the
`display' frame parameter.")
(defvar x-colors (mapcar 'car msdos-color-values)
- "List of available colors for graphical frames.
+ "List of basic colors available on color displays.
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.")
@@ -201,7 +201,11 @@ the operating system.")
(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.
+
+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.\)"
:type 'boolean
:group 'killing)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 5443b81f0bd..17c0f3aef93 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1239,7 +1239,11 @@ It is said that overlarge strings are slow to put into the cut buffer.")
(defcustom x-select-enable-clipboard nil
"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.
+
+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.\)"
:type 'boolean
:group 'killing)