comparison lisp/mouse.el @ 109587:4a3ef4f17f07

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 26 Jul 2010 22:54:37 +0000
parents 9eac3b0c2884
children 52a2d97e28e4
comparison
equal deleted inserted replaced
109543:1f97e508ee42 109587:4a3ef4f17f07
1280 ;; the middle of an active region. 1280 ;; the middle of an active region.
1281 (deactivate-mark)) 1281 (deactivate-mark))
1282 (or mouse-yank-at-point (mouse-set-point click)) 1282 (or mouse-yank-at-point (mouse-set-point click))
1283 (let ((primary (x-get-selection 'PRIMARY))) 1283 (let ((primary (x-get-selection 'PRIMARY)))
1284 (if primary 1284 (if primary
1285 (insert (x-get-selection 'PRIMARY)) 1285 (insert primary)
1286 (error "No primary selection")))) 1286 (error "No primary selection"))))
1287 1287
1288 (defun mouse-kill-ring-save (click) 1288 (defun mouse-kill-ring-save (click)
1289 "Copy the region between point and the mouse click in the kill ring. 1289 "Copy the region between point and the mouse click in the kill ring.
1290 This does not delete the region; it acts like \\[kill-ring-save]." 1290 This does not delete the region; it acts like \\[kill-ring-save]."
1575 ;; Give temporary modes such as isearch a chance to turn off. 1575 ;; Give temporary modes such as isearch a chance to turn off.
1576 (run-hooks 'mouse-leave-buffer-hook) 1576 (run-hooks 'mouse-leave-buffer-hook)
1577 (or mouse-yank-at-point (mouse-set-point click)) 1577 (or mouse-yank-at-point (mouse-set-point click))
1578 (let ((secondary (x-get-selection 'SECONDARY))) 1578 (let ((secondary (x-get-selection 'SECONDARY)))
1579 (if secondary 1579 (if secondary
1580 (insert (x-get-selection 'SECONDARY)) 1580 (insert secondary)
1581 (error "No secondary selection")))) 1581 (error "No secondary selection"))))
1582 1582
1583 (defun mouse-kill-secondary () 1583 (defun mouse-kill-secondary ()
1584 "Kill the text in the secondary selection. 1584 "Kill the text in the secondary selection.
1585 This is intended more as a keyboard command than as a mouse command 1585 This is intended more as a keyboard command than as a mouse command