diff lisp/term/x-win.el @ 83397:693e794b57bf

Merged from [e-mail]--gnu-2005 (patch 149-151, 629-641) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-629 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-630 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-631 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-632 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-633 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-634 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-635 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-636 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-637 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-638 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-639 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-640 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-641 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-149 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-150 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-151 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-437

--- a/lisp/term/x-win.el	Mon Nov 07 14:17:18 2005 +0000
+++ b/lisp/term/x-win.el	Mon Nov 07 14:56:19 2005 +0000
@@ -2122,12 +2122,12 @@
 
 ;;;; Selections and cut buffers
 
-;;; We keep track of the last text selected here, so we can check the
-;;; current selection against it, and avoid passing back our own text
-;;; from x-cut-buffer-or-selection-value.  We track all three
-;;; seperately in case another X application only sets one of them
-;;; (say the cut buffer) we aren't fooled by the PRIMARY or
-;;; CLIPBOARD selection staying the same.
+;; We keep track of the last text selected here, so we can check the
+;; current selection against it, and avoid passing back our own text
+;; from x-cut-buffer-or-selection-value.  We track all three
+;; seperately in case another X application only sets one of them
+;; (say the cut buffer) we aren't fooled by the PRIMARY or
+;; CLIPBOARD selection staying the same.
 (defvar x-last-selected-text-clipboard nil
   "The value of the CLIPBOARD X selection last time we selected or
 pasted text.")
@@ -2141,10 +2141,9 @@
   "The value of the X cut buffer last time we selected or pasted text.
 This is the actual text stored in the X cut buffer.")
 
-;;; It is said that overlarge strings are slow to put into the cut buffer.
-;;; Note this value is overridden below.
-(defvar x-cut-buffer-max 20000
-  "Max number of characters to put in the cut buffer.")
+(defvar x-cut-buffer-max 20000 ; Note this value is overridden below.
+  "Max number of characters to put in the cut buffer.
+It is said that overlarge strings are slow to put into the cut buffer.")
 
 (defcustom x-select-enable-clipboard nil
   "Non-nil means cutting and pasting uses the clipboard.
@@ -2152,12 +2151,12 @@
   :type 'boolean
   :group 'killing)
 
-;;; Make TEXT, a string, the primary X selection.
-;;; Also, set the value of X cut buffer 0, for backward compatibility
-;;; with older X applications.
-;;; [e-mail] says it's not desirable to put kills
-;;; in the clipboard.
 (defun x-select-text (text &optional push)
+  "Make TEXT, a string, the primary X selection.
+Also, set the value of X cut buffer 0, for backward compatibility
+with older X applications.
[e-mail] says it's not desirable to put kills
+in the clipboard."
   ;; Don't send the cut buffer too much text.
   ;; It becomes slow, and if really big it causes errors.
   (cond ((>= (length text) x-cut-buffer-max)
@@ -2282,12 +2281,12 @@
 	(remove-text-properties 0 (length text) '(foreign-selection nil) text))
     text))
 
-;;; Return the value of the current X selection.
-;;; Consult the selection, and the cut buffer.  Treat empty strings
-;;; as if they were unset.
-;;; If this function is called twice and finds the same text,
-;;; it returns nil the second time.  This is so that a single
-;;; selection won't be added to the kill ring over and over.
+;; Return the value of the current X selection.
+;; Consult the selection, and the cut buffer.  Treat empty strings
+;; as if they were unset.
+;; If this function is called twice and finds the same text,
+;; it returns nil the second time.  This is so that a single
+;; selection won't be added to the kill ring over and over.
 (defun x-cut-buffer-or-selection-value ()
   (let (clip-text primary-text cut-text)
     (when x-select-enable-clipboard
@@ -2526,5 +2525,5 @@
 (add-hook 'after-make-frame-functions 'x-dnd-init-frame)
 (global-set-key [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
 
-;;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
+;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78
 ;;; x-win.el ends here