mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 22:20:52 -08:00
Code Issues Projects Releases Wiki Activity

x-selection-value has been renamed to x-selection.

Browse source 
x-own-selection has been renamed to x-set-selection, and the order
	of its arguments has been reversed, for consistency with other
	lisp functions like put and aset.
	* term/x-win.el (x-select-text): Adjusted.
	(x-cut-buffer-or-selection-value): Check the primary selection,
	using x-selection, instead of checking the cut buffer again.

	* term/x-win.el: Doc fix.
This commit is contained in:
Jim Blandy 1993-01-26 01:26:58 +00:00
parent 312f637b70
commit d81fd0bf01
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/term/x-win.el
View file

@ -52,7 +52,6 @@
;; -rv *reverseVideo
;; -selectionTimeout .selectionTimeout
;; -synchronous *synchronous
;; -title .title
;; -xrm
;; An alist of X options and the function which handles them. See
@ -463,11 +462,11 @@ turn off scroll bars; otherwise, turn on scroll bars."
;;; If you are running xclipboard, this means you can effectively
;;; have a window on a copy of the kill-ring.
;;; Also, set the value of X cut buffer 0, for backward compatibility
;;; with older X application.
;;; with older X applications.
(defun x-select-text (text)
(x-set-cut-buffer 0 text)
(x-own-selection text 'clipboard)
(x-own-selection text)
(x-set-selection 'clipboard text)
(x-set-selection 'primary text)
(setq x-last-selected-text text))
;;; Return the value of the current X selection. For compatibility
@ -480,7 +479,7 @@ turn off scroll bars; otherwise, turn on scroll bars."
;; as if they were unset.
(setq text (x-get-cut-buffer 0))
(if (string= text "") (setq text nil))
(or text (setq text (x-get-cut-buffer 0)))
(or text (setq text (x-selection 'primary)))
(if (string= text "") (setq text nil))
(cond