Mercurial > emacs
changeset 1817:5c2bdeb13f68
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.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Tue, 26 Jan 1993 01:26:58 +0000 |
| parents | 7fc396d27130 |
| children | 7e3322619e46 |
| files | lisp/term/x-win.el |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Mon Jan 25 23:30:39 1993 +0000 +++ b/lisp/term/x-win.el Tue Jan 26 01:26:58 1993 +0000 @@ -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 @@ ;;; 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 @@ ;; 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