andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* term.el (term-mouse-paste): Reorder to silence --without-x compilation.

Browse source
This commit is contained in:
Glenn Morris 2013-09-17 21:46:44 -07:00
parent cd8edbbe67
commit 45069b2e00
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -6,6 +6,7 @@
Remove --without-x warning/error.
* mouse.el (mouse-yank-primary):
* term.el (term-mouse-paste):
Reorder to silence --without-x compilation.
* mpc.el (doc-view-mode): Silence --without-x compilation.

17
lisp/term.el
View file

@ -1252,15 +1252,14 @@ without any interpretation."
(setq this-command 'yank)
(mouse-set-point click)
(term-send-raw-string
(or (cond ; From `mouse-yank-primary':
((eq system-type 'windows-nt)
(or (x-get-selection 'PRIMARY)
(x-get-selection-value)))
((fboundp 'x-get-selection-value)
(or (x-get-selection-value)
(x-get-selection 'PRIMARY)))
(t
(x-get-selection 'PRIMARY)))
;; From `mouse-yank-primary':
(or (if (fboundp 'x-get-selection-value)
(if (eq system-type 'windows-nt)
(or (x-get-selection 'PRIMARY)
(x-get-selection-value))
(or (x-get-selection-value)
(x-get-selection 'PRIMARY)))
(x-get-selection 'PRIMARY))
(error "No selection is available")))))
(defun term-paste ()