diff options
| author | Glenn Morris | 2010-10-23 19:13:37 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 19:13:37 -0700 |
| commit | 3646b86d0ed250ed89d5cf40b731ef55fb46f052 (patch) | |
| tree | dea64cdf7156f8b5eecc4ec522207a9457fc9a80 /src | |
| parent | 8aa0f26343d11229fb87cd6a4473598b99b6b9a2 (diff) | |
| download | emacs-3646b86d0ed250ed89d5cf40b731ef55fb46f052.tar.gz emacs-3646b86d0ed250ed89d5cf40b731ef55fb46f052.zip | |
Sync Lisp and C docs of next-selection-coding-system.
* src/w16select.c (syms_of_win16select) <next-selection-coding-system>:
* src/w32select.c (syms_of_w32select) <next-selection-coding-system>:
Sync docs with select.el.
* lisp/select.el (next-selection-coding-system): Sync doc with C versions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w16select.c | 15 | ||||
| -rw-r--r-- | src/w32select.c | 13 |
3 files changed, 17 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b981fb29482..c2bd9e7d60b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2010-10-24 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-24 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * w16select.c (syms_of_win16select) <next-selection-coding-system>: | ||
| 4 | * w32select.c (syms_of_w32select) <next-selection-coding-system>: | ||
| 5 | Sync docs with select.el. | ||
| 6 | |||
| 3 | * xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with | 7 | * xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with |
| 4 | Lisp version. | 8 | Lisp version. |
| 5 | 9 | ||
diff --git a/src/w16select.c b/src/w16select.c index 4d471e97911..75d88b558e2 100644 --- a/src/w16select.c +++ b/src/w16select.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* 16-bit Windows Selection processing for emacs on MS-Windows | 1 | /* 16-bit Windows Selection processing for emacs on MS-Windows |
| 2 | Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, | 2 | |
| 3 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -700,11 +701,11 @@ The default value is `iso-latin-1-dos'. */); | |||
| 700 | Vselection_coding_system = intern ("iso-latin-1-dos"); | 701 | Vselection_coding_system = intern ("iso-latin-1-dos"); |
| 701 | 702 | ||
| 702 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, | 703 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, |
| 703 | doc: /* Coding system for the next communication with other X clients. | 704 | doc: /* Coding system for the next communication with other programs. |
| 704 | Usually, `selection-coding-system' is used for communicating with | 705 | Usually, `selection-coding-system' is used for communicating with |
| 705 | other X clients. But, if this variable is set, it is used for the | 706 | other programs (X Windows clients or MS Windows programs). But, if this |
| 706 | next communication only. After the communication, this variable is | 707 | variable is set, it is used for the next communication only. |
| 707 | set to nil. */); | 708 | After the communication, this variable is set to nil. */); |
| 708 | Vnext_selection_coding_system = Qnil; | 709 | Vnext_selection_coding_system = Qnil; |
| 709 | 710 | ||
| 710 | QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY); | 711 | QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY); |
| @@ -713,5 +714,3 @@ set to nil. */); | |||
| 713 | 714 | ||
| 714 | #endif /* MSDOS */ | 715 | #endif /* MSDOS */ |
| 715 | 716 | ||
| 716 | /* arch-tag: 085a22c8-7324-436e-a6da-102464ce95d8 | ||
| 717 | (do not change this comment) */ | ||
diff --git a/src/w32select.c b/src/w32select.c index f9bab384062..7b4d25c53d6 100644 --- a/src/w32select.c +++ b/src/w32select.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Selection processing for Emacs on the Microsoft W32 API. | 1 | /* Selection processing for Emacs on the Microsoft W32 API. |
| 2 | Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, | 2 | |
| 3 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -1080,9 +1081,9 @@ The default value is the current system default encoding on 9x/Me and | |||
| 1080 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, | 1081 | DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system, |
| 1081 | doc: /* Coding system for the next communication with other programs. | 1082 | doc: /* Coding system for the next communication with other programs. |
| 1082 | Usually, `selection-coding-system' is used for communicating with | 1083 | Usually, `selection-coding-system' is used for communicating with |
| 1083 | other programs. But, if this variable is set, it is used for the | 1084 | other programs (X Windows clients or MS Windows programs). But, if this |
| 1084 | next communication only. After the communication, this variable is | 1085 | variable is set, it is used for the next communication only. |
| 1085 | set to nil. */); | 1086 | After the communication, this variable is set to nil. */); |
| 1086 | Vnext_selection_coding_system = Qnil; | 1087 | Vnext_selection_coding_system = Qnil; |
| 1087 | 1088 | ||
| 1088 | DEFSYM (QCLIPBOARD, "CLIPBOARD"); | 1089 | DEFSYM (QCLIPBOARD, "CLIPBOARD"); |
| @@ -1123,5 +1124,3 @@ globals_of_w32select (void) | |||
| 1123 | clipboard_owner = create_owner (); | 1124 | clipboard_owner = create_owner (); |
| 1124 | } | 1125 | } |
| 1125 | 1126 | ||
| 1126 | /* arch-tag: c96e9724-5eb1-4dad-be07-289f092fd2af | ||
| 1127 | (do not change this comment) */ | ||