Commit d81fd0bf authored by Jim Blandy's avatar Jim Blandy
Browse files

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

	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.
parent 312f637b
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment