Make all 3 copies of x-select-enable-clipboard have the same doc.

* lisp/term/pc-win.el (x-select-enable-clipboard):
* lisp/term/x-win.el (x-select-enable-clipboard):
* lisp/w32-vars.el (x-select-enable-clipboard): Make doc-strings identical.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a0281bf595bf547f24fab5410d2325d76f71084..e90abe8fe075ee18f487c8d5f81a82ad383b1f7b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-23  Glenn Morris  <rgm@gnu.org>
 
+       * term/pc-win.el (x-select-enable-clipboard):
+       * term/x-win.el (x-select-enable-clipboard):
+       * w32-vars.el (x-select-enable-clipboard): Make doc-strings identical.
+
        * comint.el (comint-password-prompt-regexp): Make it less vague.
        Bump version.
 

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 93f4ea436c314bf71c11326e22fde66b62c027ee..16e7e8f88f047d7e4752f9ec0af24e1e64a7c984 100644 (file)
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,7 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
 
-;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainer: FSF
@@ -203,9 +203,9 @@ the operating system.")
   "Non-nil means cutting and pasting uses the clipboard.
 This is in addition to, but in preference to, the primary selection.
 
-On MS-Windows, this is non-nil by default, since Windows does not
-support other types of selections.  \(The primary selection that is
-set by Emacs is not accessible to other programs on Windows.\)"
+Note that MS-Windows does not support selection types other than the
+clipboard.   \(The primary selection that is set by Emacs is not
+accessible to other programs on MS-Windows.\)"
   :type 'boolean
   :group 'killing)
 
@@ -408,5 +408,4 @@ Errors out because it is not supposed to be called, ever."
 
 (provide 'pc-win)
 
-;; arch-tag: 5cbdb455-b495-427b-95d0-e417d77d00b4
 ;;; pc-win.el ends here

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 1950bef19be5b55786713981f9d702c75e816412..5f5336ab2bfbb3495c4530633167d1b519708f4e 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1208,7 +1208,11 @@ pasted text.")
 
 (defcustom x-select-enable-clipboard t
   "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to, but in preference to, the primary selection."
+This is in addition to, but in preference to, the primary selection.
+
+Note that MS-Windows does not support selection types other than the
+clipboard.   \(The primary selection that is set by Emacs is not
+accessible to other programs on MS-Windows.\)"
   :type 'boolean
   :group 'killing
   :version "24.1")
@@ -1640,5 +1644,4 @@ This uses `icon-map-list' to map icon file names to stock icon names."
 
 (provide 'x-win)
 
-;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
 ;;; x-win.el ends here

diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 91676dd12da41f03fea38c8794bf12891fc26196..0a6e79275a8d8125b4f778c0fce1f1734b61cb28 100644 (file)
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -152,13 +152,12 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
   "Non-nil means cutting and pasting uses the clipboard.
 This is in addition to, but in preference to, the primary selection.
 
-On MS-Windows, this is non-nil by default, since Windows does not
-support other types of selections.  \(The primary selection that is
-set by Emacs is not accessible to other programs on Windows.\)"
+Note that MS-Windows does not support selection types other than the
+clipboard.   \(The primary selection that is set by Emacs is not
+accessible to other programs on MS-Windows.\)"
   :type 'boolean
   :group 'killing)
 
 (provide 'w32-vars)
 
-;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
 ;;; w32-vars.el ends here