mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Sync docs of selection-coding-system between C and Lisp.

Browse Source 
* 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.
This commit is contained in:
Glenn Morris 2010-10-23 19:22:43 -07:00
parent 3646b86d0e
commit f5f2561564
5 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -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.

9
lisp/select.el
View File

@ -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

6
src/ChangeLog
View File

@ -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

33
src/w16select.c
View File

@ -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,

32
src/w32select.c
View File

@ -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;