diff options
| author | Jan D <jan.h.d@swipnet.se> | 2010-08-18 08:16:55 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2010-08-18 08:16:55 +0200 |
| commit | 64cb6c788376c364c8e27e99c97921ad3a308963 (patch) | |
| tree | a666e67f0f4c102d4958d2dd334a8923cf516892 /lisp | |
| parent | 0ac3effe23aeedd0474d640365968211b0097692 (diff) | |
| download | emacs-64cb6c788376c364c8e27e99c97921ad3a308963.tar.gz | |
Use CLIPBOARD and PRIMARY on NS (Bug#6677).
* lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
QCLIPBOARD instead of QPRIMARY (Bug#6677).
* src/nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
(symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
QPRIMARY => NXPrimaryPboard.
(ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
NXPrimaryPboard => QPRIMARY.
(nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
NXSecondaryPboard = SecondarySelection.
(syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2803ec0a488..e9712bd80dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-18 Jan Djärv <jan.h.d@swipnet.se> + + * term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use + QCLIPBOARD instead of QPRIMARY (Bug#6677). + 2010-08-17 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index f73b3d7e67e..d42632c3f23 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1003,7 +1003,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (defun ns-get-pasteboard () "Returns the value of the pasteboard." - (ns-get-cut-buffer-internal 'PRIMARY)) + (ns-get-cut-buffer-internal 'CLIPBOARD)) (declare-function ns-store-cut-buffer-internal "nsselect.m" (buffer string)) @@ -1011,7 +1011,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") "Store STRING into the pasteboard of the Nextstep display server." ;; Check the data type of STRING. (if (not (stringp string)) (error "Nonstring given to pasteboard")) - (ns-store-cut-buffer-internal 'PRIMARY string)) + (ns-store-cut-buffer-internal 'CLIPBOARD string)) ;; 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 |