[Emacs-diffs] /srv/bzr/emacs/trunk r102057: Make all 3 copies of x-select-enable-clipboard have the same doc.

[Glenn Morris]

------------------------------------------------------------
revno: 102057
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 13:40:46 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/term/pc-win.el
  lisp/term/x-win.el
  lisp/w32-vars.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-23 19:56:57 +0000
+++ b/lisp/ChangeLog    2010-10-23 20:40:46 +0000
@@ -1,5 +1,9 @@
 2010-10-23  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/term/pc-win.el'
--- a/lisp/term/pc-win.el       2010-10-02 02:46:13 +0000
+++ b/lisp/term/pc-win.el       2010-10-23 20:40:46 +0000
@@ -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 <address@hidden>
 ;; Maintainer: FSF
@@ -203,9 +203,9 @@
   "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 @@
 
 (provide 'pc-win)
 
-;; arch-tag: 5cbdb455-b495-427b-95d0-e417d77d00b4
 ;;; pc-win.el ends here

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2010-09-16 22:47:21 +0000
+++ b/lisp/term/x-win.el        2010-10-23 20:40:46 +0000
@@ -1208,7 +1208,11 @@
 
 (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 @@
 
 (provide 'x-win)
 
-;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
 ;;; x-win.el ends here

=== modified file 'lisp/w32-vars.el'
--- a/lisp/w32-vars.el  2010-08-29 16:17:13 +0000
+++ b/lisp/w32-vars.el  2010-10-23 20:40:46 +0000
@@ -152,13 +152,12 @@
   "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