aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2007-11-17 10:33:27 +0000
committerEli Zaretskii <[email protected]>2007-11-17 10:33:27 +0000
commit221bb7f6773602465933b7702bc0e0032410cd40 (patch)
tree5339ef00bac117c43361360748c7327df5a70231
parent48b0e82e67abee0b83abdc0469a162ad4f98daaa (diff)
(Communication Coding): Fix wording of last change.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/mule.texi19
2 files changed, 16 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index edb155216d..cb40f08230 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-17 Eli Zaretskii <[email protected]>
+
+ * mule.texi (Communication Coding): Fix wording of last change.
+
2007-11-16 Werner Lemberg <[email protected]>
* custom.texi (Specifying File Variables), major.texi (Choosing
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 4a7eceea0e..27b3284082 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1087,13 +1087,18 @@ you override it by using the command again. The command @kbd{C-x
coding system for the next selection made in Emacs or read by Emacs.
@vindex x-select-request-type
- The variable @code{x-select-request-type} specifies a data type of
-selection to request for receiving the text from the other
-applications. The default value is nil, which means Emacs tries
-`COMPOUND_TEXT' and `UTF8_STRING', and use the more appropriate
-result. You can explicitly specify the data type by setting the
-variable to one of the followings:
- `COMPOUND_TEXT', `UTF8_STRING', `STRING', `TEXT'
+ The variable @code{x-select-request-type} specifies the data type to
+request from the X Window System for receiving text selections from
+other applications. If the value is @code{nil} (the default), Emacs
+tries @code{COMPOUND_TEXT} and @code{UTF8_STRING}, in this order, and
+uses various heuristics to choose the more appropriate of the two
+results; if none of these succeed, Emacs falls back on @code{STRING}.
+If the value of @code{x-select-request-type} is one of the symbols
+@code{COMPOUND_TEXT}, @code{UTF8_STRING}, @code{STRING}, or
+@code{TEXT}, Emacs uses only that request type. If the value is a
+list of some of these symbols, Emacs tries only the request types in
+the list, in order, until one of them succeeds, or until the list is
+exhausted.
@kindex C-x RET p
@findex set-buffer-process-coding-system