Commit 6f748f70 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 7aa93795
2010-10-23 Glenn Morris <rgm@gnu.org> 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. * comint.el (comint-password-prompt-regexp): Make it less vague.
Bump version. Bump version.
   
......
;;; pc-win.el --- setup support for `PC windows' (whatever that is) ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk> ;; Author: Morten Welinder <terra@diku.dk>
;; Maintainer: FSF ;; Maintainer: FSF
...@@ -203,9 +203,9 @@ the operating system.") ...@@ -203,9 +203,9 @@ the operating system.")
"Non-nil means cutting and pasting uses the clipboard. "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.
On MS-Windows, this is non-nil by default, since Windows does not Note that MS-Windows does not support selection types other than the
support other types of selections. \(The primary selection that is clipboard. \(The primary selection that is set by Emacs is not
set by Emacs is not accessible to other programs on Windows.\)" accessible to other programs on MS-Windows.\)"
:type 'boolean :type 'boolean
:group 'killing) :group 'killing)
...@@ -408,5 +408,4 @@ Errors out because it is not supposed to be called, ever." ...@@ -408,5 +408,4 @@ Errors out because it is not supposed to be called, ever."
(provide 'pc-win) (provide 'pc-win)
;; arch-tag: 5cbdb455-b495-427b-95d0-e417d77d00b4
;;; pc-win.el ends here ;;; pc-win.el ends here
...@@ -1208,7 +1208,11 @@ pasted text.") ...@@ -1208,7 +1208,11 @@ pasted text.")
(defcustom x-select-enable-clipboard t (defcustom x-select-enable-clipboard t
"Non-nil means cutting and pasting uses the clipboard. "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 :type 'boolean
:group 'killing :group 'killing
:version "24.1") :version "24.1")
...@@ -1640,5 +1644,4 @@ This uses `icon-map-list' to map icon file names to stock icon names." ...@@ -1640,5 +1644,4 @@ This uses `icon-map-list' to map icon file names to stock icon names."
(provide 'x-win) (provide 'x-win)
;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
;;; x-win.el ends here ;;; x-win.el ends here
...@@ -152,13 +152,12 @@ menu if the variable `w32-use-w32-font-dialog' is nil." ...@@ -152,13 +152,12 @@ menu if the variable `w32-use-w32-font-dialog' is nil."
"Non-nil means cutting and pasting uses the clipboard. "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.
On MS-Windows, this is non-nil by default, since Windows does not Note that MS-Windows does not support selection types other than the
support other types of selections. \(The primary selection that is clipboard. \(The primary selection that is set by Emacs is not
set by Emacs is not accessible to other programs on Windows.\)" accessible to other programs on MS-Windows.\)"
:type 'boolean :type 'boolean
:group 'killing) :group 'killing)
(provide 'w32-vars) (provide 'w32-vars)
;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
;;; w32-vars.el ends here ;;; w32-vars.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment