aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-11-17 10:33:27 +0000
committerEli Zaretskii2007-11-17 10:33:27 +0000
commit221bb7f6773602465933b7702bc0e0032410cd40 (patch)
tree5339ef00bac117c43361360748c7327df5a70231
parent48b0e82e67abee0b83abdc0469a162ad4f98daaa (diff)
downloademacs-221bb7f6773602465933b7702bc0e0032410cd40.tar.gz
emacs-221bb7f6773602465933b7702bc0e0032410cd40.zip
(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 edb155216d3..cb40f082307 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12007-11-17 Eli Zaretskii <eliz@gnu.org>
2
3 * mule.texi (Communication Coding): Fix wording of last change.
4
12007-11-16 Werner Lemberg <wl@gnu.org> 52007-11-16 Werner Lemberg <wl@gnu.org>
2 6
3 * custom.texi (Specifying File Variables), major.texi (Choosing 7 * custom.texi (Specifying File Variables), major.texi (Choosing
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 4a7eceea0eb..27b3284082f 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
1087coding system for the next selection made in Emacs or read by Emacs. 1087coding system for the next selection made in Emacs or read by Emacs.
1088 1088
1089@vindex x-select-request-type 1089@vindex x-select-request-type
1090 The variable @code{x-select-request-type} specifies a data type of 1090 The variable @code{x-select-request-type} specifies the data type to
1091selection to request for receiving the text from the other 1091request from the X Window System for receiving text selections from
1092applications. The default value is nil, which means Emacs tries 1092other applications. If the value is @code{nil} (the default), Emacs
1093`COMPOUND_TEXT' and `UTF8_STRING', and use the more appropriate 1093tries @code{COMPOUND_TEXT} and @code{UTF8_STRING}, in this order, and
1094result. You can explicitly specify the data type by setting the 1094uses various heuristics to choose the more appropriate of the two
1095variable to one of the followings: 1095results; if none of these succeed, Emacs falls back on @code{STRING}.
1096 `COMPOUND_TEXT', `UTF8_STRING', `STRING', `TEXT' 1096If the value of @code{x-select-request-type} is one of the symbols
1097@code{COMPOUND_TEXT}, @code{UTF8_STRING}, @code{STRING}, or
1098@code{TEXT}, Emacs uses only that request type. If the value is a
1099list of some of these symbols, Emacs tries only the request types in
1100the list, in order, until one of them succeeds, or until the list is
1101exhausted.
1097 1102
1098@kindex C-x RET p 1103@kindex C-x RET p
1099@findex set-buffer-process-coding-system 1104@findex set-buffer-process-coding-system