[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102073: Sync docs of selection-codin
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102073: Sync docs of selection-coding-system between C and Lisp. |
Date: |
Sat, 23 Oct 2010 19:22:43 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102073
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 19:22:43 -0700
message:
Sync docs of selection-coding-system between C and Lisp.
* src/w16select.c (syms_of_win16select) <selection-coding-system>:
* src/w32select.c (syms_of_w32select) <selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (selection-coding-system): Sync doc with C versions.
modified:
lisp/ChangeLog
lisp/select.el
src/ChangeLog
src/w16select.c
src/w32select.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-24 02:13:37 +0000
+++ b/lisp/ChangeLog 2010-10-24 02:22:43 +0000
@@ -1,6 +1,7 @@
2010-10-24 Glenn Morris <address@hidden>
- * select.el (next-selection-coding-system): Sync doc with C versions.
+ * select.el (selection-coding-system, next-selection-coding-system):
+ Sync doc with C versions.
* w32-vars.el (x-select-enable-clipboard):
* term/x-win.el (x-select-enable-clipboard): Move to common-win.
=== modified file 'lisp/select.el'
--- a/lisp/select.el 2010-10-24 02:13:37 +0000
+++ b/lisp/select.el 2010-10-24 02:22:43 +0000
@@ -28,8 +28,15 @@
;;; Code:
(defcustom selection-coding-system nil
- "Coding system for communicating with other X clients.
-
+ "Coding system for communicating with other programs.
+
+For MS-Windows and MS-DOS:
+When sending or receiving text via selection and clipboard, the text
+is encoded or decoded by this coding system. The default value is
+the current system default encoding on 9x/Me, `utf-16le-dos'
+\(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS.
+
+For X Windows:
When sending text via selection and clipboard, if the target
data-type matches with the type of this coding system, it is used
for encoding the text. Otherwise (including the case that this
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-10-24 02:13:37 +0000
+++ b/src/ChangeLog 2010-10-24 02:22:43 +0000
@@ -1,7 +1,9 @@
2010-10-24 Glenn Morris <address@hidden>
- * w16select.c (syms_of_win16select) <next-selection-coding-system>:
- * w32select.c (syms_of_w32select) <next-selection-coding-system>:
+ * w16select.c (syms_of_win16select) <selection-coding-system>:
+ <next-selection-coding-system>:
+ * w32select.c (syms_of_w32select) <selection-coding-system>:
+ <next-selection-coding-system>:
Sync docs with select.el.
* xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
=== modified file 'src/w16select.c'
--- a/src/w16select.c 2010-10-24 02:13:37 +0000
+++ b/src/w16select.c 2010-10-24 02:22:43 +0000
@@ -694,10 +694,35 @@
defsubr (&Sx_selection_exists_p);
DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
- doc: /* Coding system for communicating with other X clients.
-When sending or receiving text via cut_buffer, selection, and clipboard,
-the text is encoded or decoded by this coding system.
-The default value is `iso-latin-1-dos'. */);
+ doc: /* Coding system for communicating with other programs.
+
+For MS-Windows and MS-DOS:
+When sending or receiving text via selection and clipboard, the text
+is encoded or decoded by this coding system. The default value is
+the current system default encoding on 9x/Me, `utf-16le-dos'
+\(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS.
+
+For X Windows:
+When sending text via selection and clipboard, if the target
+data-type matches with the type of this coding system, it is used
+for encoding the text. Otherwise (including the case that this
+variable is nil), a proper coding system is used as below:
+
+data-type coding system
+--------- -------------
+UTF8_STRING utf-8
+COMPOUND_TEXT compound-text-with-extensions
+STRING iso-latin-1
+C_STRING no-conversion
+
+When receiving text, if this coding system is non-nil, it is used
+for decoding regardless of the data-type. If this is nil, a
+proper coding system is used according to the data-type as above.
+
+See also the documentation of the variable `x-select-request-type' how
+to control which data-type to request for receiving text.
+
+The default value is nil. */);
Vselection_coding_system = intern ("iso-latin-1-dos");
DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
=== modified file 'src/w32select.c'
--- a/src/w32select.c 2010-10-24 02:13:37 +0000
+++ b/src/w32select.c 2010-10-24 02:22:43 +0000
@@ -1070,10 +1070,34 @@
DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
doc: /* Coding system for communicating with other programs.
-When sending or receiving text via cut_buffer, selection, and
-clipboard, the text is encoded or decoded by this coding system.
-The default value is the current system default encoding on 9x/Me and
-`utf-16le-dos' (Unicode) on NT/W2K/XP. */);
+
+For MS-Windows and MS-DOS:
+When sending or receiving text via selection and clipboard, the text
+is encoded or decoded by this coding system. The default value is
+the current system default encoding on 9x/Me, `utf-16le-dos'
+\(Unicode) on NT/W2K/XP, and `iso-latin-1-dos' on MS-DOS.
+
+For X Windows:
+When sending text via selection and clipboard, if the target
+data-type matches with the type of this coding system, it is used
+for encoding the text. Otherwise (including the case that this
+variable is nil), a proper coding system is used as below:
+
+data-type coding system
+--------- -------------
+UTF8_STRING utf-8
+COMPOUND_TEXT compound-text-with-extensions
+STRING iso-latin-1
+C_STRING no-conversion
+
+When receiving text, if this coding system is non-nil, it is used
+for decoding regardless of the data-type. If this is nil, a
+proper coding system is used according to the data-type as above.
+
+See also the documentation of the variable `x-select-request-type' how
+to control which data-type to request for receiving text.
+
+The default value is nil. */);
/* The actual value is set dynamically in the dumped Emacs, see
below. */
Vselection_coding_system = Qnil;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102073: Sync docs of selection-coding-system between C and Lisp.,
Glenn Morris <=