diff options
| -rw-r--r-- | doc/emacs/frames.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/frames.texi | 22 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 9 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/misc/cl.texi | 8 | ||||
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/eshell/em-term.el | 3 | ||||
| -rw-r--r-- | lisp/frame.el | 3 | ||||
| -rw-r--r-- | lisp/mouse-sel.el | 4 | ||||
| -rw-r--r-- | lisp/term.el | 3 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 3 | ||||
| -rw-r--r-- | lisp/term/pc-win.el | 5 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 4 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 5 |
15 files changed, 38 insertions, 60 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index fb7413e8593..df4f0beff9e 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -273,15 +273,6 @@ the kill ring. This prevents you from losing the existing selection, 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 --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index cd99c701ac2..a494cac961b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2010-09-02 Jan Djärv <jan.h.d@swipnet.se> + + * text.texi (Low-Level Kill Ring): + * frames.texi (Window System Selections): Remove cut buffer + documentation. + 2010-08-28 Eli Zaretskii <eliz@gnu.org> * display.texi (Fringe Size/Pos): Add a cross-reference to "Layout diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 78b4178bb21..d27010d2096 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1985,28 +1985,6 @@ with X conventions.) The default for @var{data-type} is @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 --git a/doc/lispref/text.texi b/doc/lispref/text.texi index a7c4a3e62f4..142a071f494 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -1126,16 +1126,13 @@ use @code{string=} to compare it with the last text Emacs provided.) @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 --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d811c3b7e43..c97688438c6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,6 @@ +2010-09-02 Jan Djärv <jan.h.d@swipnet.se> + * cl.texi (Basic Setf): Remove x-get-cut-buffer and x-get-cutbuffer. + 2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.texi (HTML): Document gnus-max-image-proportion. diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 96e4a28ae82..de57ff7d095 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -1043,10 +1043,10 @@ frame-visible-p window-hscroll 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 --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. |