Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/term.el (term-mouse-paste): Yank primary selection (Bug#6845).

Browse source
This commit is contained in:
Chong Yidong 2011-08-21 13:56:19 -04:00
parent 23a8a5ab69
commit ff98b2dd51
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -1,5 +1,7 @@
2011-08-21 Chong Yidong <cyd@stupidchicken.com>
* term.el (term-mouse-paste): Yank primary selection (Bug#6845).
* emacs-lisp/find-func.el (find-function-noselect): New arg
lisp-only.

21
lisp/term.el
View file

@ -1227,9 +1227,9 @@ without any interpretation."
(make-string 1 char)
(format "\e%c" char)))))
(defun term-mouse-paste (click arg)
"Insert the last stretch of killed text at the position clicked on."
(interactive "e\nP")
(defun term-mouse-paste (click)
"Insert the primary selection at the position clicked on."
(interactive "e")
(if (featurep 'xemacs)
(term-send-raw-string
(or (condition-case () (x-get-selection) (error ()))
@ -1238,10 +1238,17 @@ without any interpretation."
(run-hooks 'mouse-leave-buffer-hook)
(setq this-command 'yank)
(mouse-set-point click)
(term-send-raw-string (current-kill (cond
((listp arg) 0)
((eq arg '-) -1)
(t (1- arg)))))))
(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)))
(error "No selection is available")))))
(defun term-paste ()
"Insert the last stretch of killed text at point."