Remove cut buffer from documentation.

* doc/emacs/frames.texi (Cut/Paste Other App): Remove vut-buffer text.

* doc/lispref/text.texi (Low-Level Kill Ring):
* doc/lispref/frames.texi (Window System Selections): Remove cut buffer
documentation.

* doc/misc/cl.texi (Basic Setf): Remove x-get-cut-buffer and x-get-cutbuffer.

* lisp/term/x-win.el (x-select-text):
* lisp/term/pc-win.el (x-selection-value):
* lisp/term/ns-win.el (x-selection-value):
* lisp/eshell/em-term.el:
* lisp/w32-fns.el (x-get-selection-value):
* lisp/mouse-sel.el (mouse-sel-set-selection-function):
* lisp/frame.el (display-selections-p): Remove cut-buffer in documentation.

* lisp/term.el (term-mouse-paste): Don't call x-get-cutbuffer.
Remove cut buffer from error message.

9 files changed, 22 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index baa1b0fd353..868a8e303b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * term.el (term-mouse-paste): Don't call x-get-cutbuffer.
+        Remove cut buffer from error message.
+
+        * term/x-win.el (x-select-text):
+        * term/pc-win.el (x-selection-value):
+        * term/ns-win.el (x-selection-value):
+        * eshell/em-term.el:
+        * w32-fns.el (x-get-selection-value):
+        * mouse-sel.el (mouse-sel-set-selection-function):
+        * frame.el (display-selections-p): Remove cut-buffer in documentation.
+
         * term/x-win.el: Update documentation for x-last-selected-text-*.
         (x-last-selected-text-cut, x-last-selected-text-cut-encoded)
         (x-last-cut-buffer-coding, x-cut-buffer-max): Remove.
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 8662dd9fffb..826e7ec0d05 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -187,8 +187,7 @@ allowed."
 ;   (if (boundp 'xemacs-logo)
 ;       (eshell-term-send-raw-string
 ;        (or (condition-case () (x-get-selection) (error ()))
-;          (x-get-cutbuffer)
-;          (error "No selection or cut buffer available")))
+;          (error "No selection available")))
 ;     ;; Give temporary modes such as isearch a chance to turn off.
 ;     (run-hooks 'mouse-leave-buffer-hook)
 ;     (setq this-command 'yank)
diff --git a/lisp/frame.el b/lisp/frame.el
index 8f65cc7f1e5..7a12c9fc2e0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1210,8 +1210,7 @@ frame's display)."
 (defun display-selections-p (&optional display)
   "Return non-nil if DISPLAY supports selections.
 A selection is a way to transfer text or other data between programs
-via special system buffers called `selection' or `cut buffer' or
-`clipboard'.
+via special system buffers called `selection' or `clipboard'.
 DISPLAY can be a display name, a frame, or nil (meaning the selected
 frame's display)."
   (let ((frame-type (framep-on-display display)))
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 65a52ef664c..f3875e24f07 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -314,8 +314,8 @@ Called with two arguments:
   SELECTION, the name of the selection concerned, and
   VALUE, the text to store.
 
-This sets the selection as well as the cut buffer for the older applications,
-unless `mouse-sel-default-bindings' is `interprogram-cut-paste'.")
+This sets the selection, unless `mouse-sel-default-bindings' 
+is `interprogram-cut-paste'.")
 
 (declare-function x-selection-value "term/x-win" ())
 
diff --git a/lisp/term.el b/lisp/term.el
index d5e0d149ae5..80f5dcdc01a 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1231,8 +1231,7 @@ without any interpretation."
   (if (featurep 'xemacs)
       (term-send-raw-string
        (or (condition-case () (x-get-selection) (error ()))
-           (x-get-cutbuffer)
-           (error "No selection or cut buffer available")))
+           (error "No selection available")))
     ;; Give temporary modes such as isearch a chance to turn off.
     (run-hooks 'mouse-leave-buffer-hook)
     (setq this-command 'yank)
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index ffd230d596f..dd386fe1338 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1041,8 +1041,7 @@ On Nextstep, put TEXT in the pasteboard."
 (defun x-selection-value ()
   (let (text)
 
-    ;; Consult the selection, then the cut buffer.  Treat empty strings
-    ;; as if they were unset.
+    ;; Consult the selection.  Treat empty strings as if they were unset.
     (or text (setq text (ns-get-pasteboard)))
     (if (string= text "") (setq text nil))
 
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b3dc488ad77..b52e408b193 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -192,7 +192,7 @@ the operating system.")
 
 ;; From lisp/term/w32-win.el
 ;
-;;;; Selections and cut buffers
+;;;; Selections
 ;
 ;;; 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
@@ -226,8 +226,7 @@ On Nextstep, put TEXT in the pasteboard."
   (setq x-last-selected-text text))
 
 ;;; Return the value of the current selection.
-;;; Consult the selection, then the cut buffer.  Treat empty strings
-;;; as if they were unset.
+;;; Consult the selection.  Treat empty strings as if they were unset.
 (defun x-get-selection-value ()
   (if x-select-enable-clipboard
       (let (text)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 1dcf0fed530..b19e0f854d9 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1192,7 +1192,7 @@ as returned by `x-server-vendor'."
 ;; #x0dde       THAI MAIHANAKAT Thai
 
 
-;;;; Selections and cut buffers
+;;;; Selections
 
 ;; 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
@@ -1233,8 +1233,6 @@ clipboard as well.
 On Nextstep, put TEXT in the pasteboard."
   ;; With multi-tty, this function may be called from a tty frame.
   (when (eq (framep (selected-frame)) 'x)
-    ;; Don't send the cut buffer too much text.
-    ;; It becomes slow, and if really big it causes errors.
     (when x-select-enable-primary
       (x-set-selection 'PRIMARY text)
       (setq x-last-selected-text-primary text))
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 3bd239f73f8..1abb29febc7 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -425,7 +425,7 @@ bit output with no translation."
                         'w32-charset-info-alist "21.1")
 
 
-;;;; Selections and cut buffers
+;;;; Selections
 
 ;; 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
@@ -450,8 +450,7 @@ On Nextstep, put TEXT in the pasteboard."
 
 (defun x-get-selection-value ()
   "Return the value of the current selection.
-Consult the selection, then the cut buffer.  Treat empty strings as if
-they were unset."
+Consult the selection.  Treat empty strings as if they were unset."
   (if x-select-enable-clipboard
       (let (text)
         ;; Don't die if x-get-selection signals an error.