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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc803bb385fc7d76890d000e4426f9aedaa35e4..384633b1ad8c955c73678ecd9974312665b03d19 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
-       * 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.

diff --git a/lisp/select.el b/lisp/select.el
index 2b97ca483b108717c09e3d604f5f73baa5ebf593..23541963438e8f9df0aac1ba40af8ac7fa3b653b 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -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

diff --git a/src/ChangeLog b/src/ChangeLog
index c2bd9e7d60bb01bd6219502eaf5d6f870a62b314..755a35a2713807f6c26ff3bf1e0f14ccd4cc9fba 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,9 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
-       * 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

diff --git a/src/w16select.c b/src/w16select.c
index 75d88b558e21633bf58cd9f419d73d54df08adf9..994ad9e543fca8fd03a09176b7c241b04dda95aa 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -694,10 +694,35 @@ syms_of_win16select (void)
   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,

diff --git a/src/w32select.c b/src/w32select.c
index 7b4d25c53d636d6ef0e758889de9bf0e932bb607..18694d2d33420ee77b5db5e0fc00d13b18d4558d 100644 (file)
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1070,10 +1070,34 @@ syms_of_w32select (void)
 
   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;