# HG changeset patch # User Jan D. # Date 1283422622 -7200 # Node ID bcc7c00e9ef460b19c87d17afba68ca4ece40acc # Parent 1144008a21656277e51d988ab4a97bce99d8e58c 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. diff -r 1144008a2165 -r bcc7c00e9ef4 doc/emacs/frames.texi --- a/doc/emacs/frames.texi Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/emacs/frames.texi Thu Sep 02 12:17:02 2010 +0200 @@ -273,15 +273,6 @@ at the risk of large memory consumption if other applications generate large selections. -@cindex cut buffer -@vindex x-cut-buffer-max - Whenever Emacs saves some text to the primary selection, it may also -save it to the @dfn{cut buffer}. The cut buffer is an obsolete -predecessor to the primary selection; most modern applications do not -use it. Saving text to the cut buffer is slow and inefficient, so -Emacs only does it if the text is shorter than the value of -@code{x-cut-buffer-max} (20000 characters by default). - You can yank the primary selection into Emacs using the usual yank commands, such as @kbd{C-y} (@code{yank}) and @kbd{Mouse-2} (@code{mouse-yank-at-click}). These commands actually check the diff -r 1144008a2165 -r bcc7c00e9ef4 doc/lispref/ChangeLog --- a/doc/lispref/ChangeLog Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/lispref/ChangeLog Thu Sep 02 12:17:02 2010 +0200 @@ -1,3 +1,9 @@ +2010-09-02 Jan Djärv + + * text.texi (Low-Level Kill Ring): + * frames.texi (Window System Selections): Remove cut buffer + documentation. + 2010-08-28 Eli Zaretskii * display.texi (Fringe Size/Pos): Add a cross-reference to "Layout diff -r 1144008a2165 -r bcc7c00e9ef4 doc/lispref/frames.texi --- a/doc/lispref/frames.texi Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/lispref/frames.texi Thu Sep 02 12:17:02 2010 +0200 @@ -1985,28 +1985,6 @@ @code{STRING}. @end defun -@cindex cut buffer -The X server also has a set of eight numbered @dfn{cut buffers} which can -store text or other data being moved between applications. Cut buffers -are considered obsolete, but Emacs supports them for the sake of X -clients that still use them. Cut buffers are numbered from 0 to 7. - -@defun x-get-cut-buffer &optional n -This function returns the contents of cut buffer number @var{n}. -If omitted @var{n} defaults to 0. -@end defun - -@defun x-set-cut-buffer string &optional push -@anchor{Definition of x-set-cut-buffer} -This function stores @var{string} into the first cut buffer (cut buffer -0). If @var{push} is @code{nil}, only the first cut buffer is changed. -If @var{push} is non-@code{nil}, that says to move the values down -through the series of cut buffers, much like the way successive kills in -Emacs move down the kill ring. In other words, the previous value of -the first cut buffer moves into the second cut buffer, and the second to -the third, and so on through all eight cut buffers. -@end defun - @defopt selection-coding-system This variable specifies the coding system to use when reading and writing selections or the clipboard. @xref{Coding diff -r 1144008a2165 -r bcc7c00e9ef4 doc/lispref/text.texi --- a/doc/lispref/text.texi Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/lispref/text.texi Thu Sep 02 12:17:02 2010 +0200 @@ -1126,16 +1126,13 @@ @defvar interprogram-cut-function This variable provides a way of communicating killed text to other programs, when you are using a window system. Its value should be -@code{nil} or a function of one required and one optional argument. +@code{nil} or a function of one required argument. If the value is a function, @code{kill-new} and @code{kill-append} call -it with the new first element of the kill ring as the first argument. -The second, optional, argument has the same meaning as the @var{push} -argument to @code{x-set-cut-buffer} (@pxref{Definition of -x-set-cut-buffer}) and only affects the second and later cut buffers. +it with the new first element of the kill ring as the argument. The normal use of this function is to set the window system's primary -selection (and first cut buffer) from the newly killed text. +selection from the newly killed text. @xref{Window System Selections}. @end defvar diff -r 1144008a2165 -r bcc7c00e9ef4 doc/misc/ChangeLog --- a/doc/misc/ChangeLog Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/misc/ChangeLog Thu Sep 02 12:17:02 2010 +0200 @@ -1,3 +1,6 @@ +2010-09-02 Jan Djärv + * cl.texi (Basic Setf): Remove x-get-cut-buffer and x-get-cutbuffer. + 2010-09-01 Lars Magne Ingebrigtsen * gnus.texi (HTML): Document gnus-max-image-proportion. diff -r 1144008a2165 -r bcc7c00e9ef4 doc/misc/cl.texi --- a/doc/misc/cl.texi Thu Sep 02 11:52:24 2010 +0200 +++ b/doc/misc/cl.texi Thu Sep 02 12:17:02 2010 +0200 @@ -1043,10 +1043,10 @@ frame-width window-point get-register window-start getenv window-width -global-key-binding x-get-cut-buffer -keymap-parent x-get-cutbuffer -local-key-binding x-get-secondary-selection -mark x-get-selection +global-key-binding x-get-secondary-selection +keymap-parent x-get-selection +local-key-binding +mark mark-marker @end smallexample diff -r 1144008a2165 -r bcc7c00e9ef4 lisp/ChangeLog --- a/lisp/ChangeLog Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/ChangeLog Thu Sep 02 12:17:02 2010 +0200 @@ -1,5 +1,16 @@ 2010-09-02 Jan Djärv + * 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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/eshell/em-term.el --- a/lisp/eshell/em-term.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/eshell/em-term.el Thu Sep 02 12:17:02 2010 +0200 @@ -187,8 +187,7 @@ ; (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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/frame.el --- a/lisp/frame.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/frame.el Thu Sep 02 12:17:02 2010 +0200 @@ -1210,8 +1210,7 @@ (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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/mouse-sel.el --- a/lisp/mouse-sel.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/mouse-sel.el Thu Sep 02 12:17:02 2010 +0200 @@ -314,8 +314,8 @@ 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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/term.el --- a/lisp/term.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/term.el Thu Sep 02 12:17:02 2010 +0200 @@ -1231,8 +1231,7 @@ (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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/term/ns-win.el --- a/lisp/term/ns-win.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/term/ns-win.el Thu Sep 02 12:17:02 2010 +0200 @@ -1041,8 +1041,7 @@ (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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/term/pc-win.el --- a/lisp/term/pc-win.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/term/pc-win.el Thu Sep 02 12:17:02 2010 +0200 @@ -192,7 +192,7 @@ ;; 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 @@ (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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/term/x-win.el --- a/lisp/term/x-win.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/term/x-win.el Thu Sep 02 12:17:02 2010 +0200 @@ -1192,7 +1192,7 @@ ;; #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 @@ 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 -r 1144008a2165 -r bcc7c00e9ef4 lisp/w32-fns.el --- a/lisp/w32-fns.el Thu Sep 02 11:52:24 2010 +0200 +++ b/lisp/w32-fns.el Thu Sep 02 12:17:02 2010 +0200 @@ -425,7 +425,7 @@ '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 @@ (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.