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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81ad3afecd9e548a94c7592d4cf29402e1efce1e..1dc803bb385fc7d76890d000e4426f9aedaa35e4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
+       * select.el (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.
        * term/common-win.el (x-select-enable-clipboard): Move here.

diff --git a/lisp/select.el b/lisp/select.el
index 3e9cd2d5d53aba58c34cef8c97fcaf5a2a54f310..2b97ca483b108717c09e3d604f5f73baa5ebf593 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -1,12 +1,11 @@
 ;;; select.el --- lisp portion of standard selection support
 
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
+
 ;; Maintainer: FSF
 ;; Keywords: internal
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010 Free Software Foundation, Inc.
-;; Based partially on earlier release by Lucid.
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -24,6 +23,8 @@
 
 ;;; Commentary:
 
+;; Based partially on earlier release by Lucid.
+
 ;;; Code:
 
 (defcustom selection-coding-system nil
@@ -58,11 +59,11 @@ The default value is nil."
          (set symbol value)))
 
 (defvar next-selection-coding-system nil
-  "Coding system for the next communication with other X clients.
+  "Coding system for the next communication with other programs.
 Usually, `selection-coding-system' is used for communicating with
-other X clients.  But, if this variable is set, it is used for
-the next communication only.  After the communication, this
-variable is set to nil.")
+other programs (X Windows clients or MS Windows programs).  But, if this
+variable is set, it is used for the next communication only.
+After the communication, this variable is set to nil.")
 
 (declare-function x-get-selection-internal "xselect.c"
                  (selection-symbol target-type &optional time-stamp))
@@ -380,5 +381,4 @@ This function returns the string \"emacs\"."
 
 (provide 'select)
 
-;; arch-tag: bb634f97-8a3b-4b0a-b940-f6e09982328c
 ;;; select.el ends here

diff --git a/src/ChangeLog b/src/ChangeLog
index b981fb29482ec05b736cad4398a7e4f19c33db18..c2bd9e7d60bb01bd6219502eaf5d6f870a62b314 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +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>:
+       Sync docs with select.el.
+
        * xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
        Lisp version.
 

diff --git a/src/w16select.c b/src/w16select.c
index 4d471e979115f9d8ad8b40104553ea6e855c9ed1..75d88b558e21633bf58cd9f419d73d54df08adf9 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -1,6 +1,7 @@
 /* 16-bit Windows Selection processing for emacs on MS-Windows
-   Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -700,11 +701,11 @@ The default value is `iso-latin-1-dos'.  */);
   Vselection_coding_system = intern ("iso-latin-1-dos");
 
   DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
-              doc: /* Coding system for the next communication with other X clients.
+              doc: /* Coding system for the next communication with other programs.
 Usually, `selection-coding-system' is used for communicating with
-other X clients.  But, if this variable is set, it is used for the
-next communication only.  After the communication, this variable is
-set to nil.  */);
+other programs (X Windows clients or MS Windows programs).  But, if this
+variable is set, it is used for the next communication only.
+After the communication, this variable is set to nil.  */);
   Vnext_selection_coding_system = Qnil;
 
   QPRIMARY   = intern ("PRIMARY");     staticpro (&QPRIMARY);
@@ -713,5 +714,3 @@ set to nil.  */);
 
 #endif /* MSDOS */
 
-/* arch-tag: 085a22c8-7324-436e-a6da-102464ce95d8
-   (do not change this comment) */

diff --git a/src/w32select.c b/src/w32select.c
index f9bab384062a90d2e505719565773270d7b927eb..7b4d25c53d636d6ef0e758889de9bf0e932bb607 100644 (file)
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,7 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
-   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1080,9 +1081,9 @@ The default value is the current system default encoding on 9x/Me and
   DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
               doc: /* Coding system for the next communication with other programs.
 Usually, `selection-coding-system' is used for communicating with
-other programs.  But, if this variable is set, it is used for the
-next communication only.  After the communication, this variable is
-set to nil.  */);
+other programs (X Windows clients or MS Windows programs).  But, if this
+variable is set, it is used for the next communication only.
+After the communication, this variable is set to nil.  */);
   Vnext_selection_coding_system = Qnil;
 
   DEFSYM (QCLIPBOARD, "CLIPBOARD");
@@ -1123,5 +1124,3 @@ globals_of_w32select (void)
   clipboard_owner = create_owner ();
 }
 
-/* arch-tag: c96e9724-5eb1-4dad-be07-289f092fd2af
-   (do not change this comment) */