Mercurial > emacs
comparison lisp/isearch.el @ 90614:8dd8c8286063
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 460-475)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 145-152)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 15 Oct 2006 02:54:13 +0000 |
parents | bb0e318b7c53 b4697c34c8fd |
children | e4e4a56ef723 |
comparison
equal
deleted
inserted
replaced
90613:7a2fdfcc7f71 | 90614:8dd8c8286063 |
---|---|
1287 | 1287 |
1288 | 1288 |
1289 (defun isearch-mouse-2 (click) | 1289 (defun isearch-mouse-2 (click) |
1290 "Handle mouse-2 in Isearch mode. | 1290 "Handle mouse-2 in Isearch mode. |
1291 For a click in the echo area, invoke `isearch-yank-x-selection'. | 1291 For a click in the echo area, invoke `isearch-yank-x-selection'. |
1292 Otherwise invoke whatever mouse-2 is bound to outside of Isearch." | 1292 Otherwise invoke whatever the calling mouse-2 command sequence |
1293 is bound to outside of Isearch." | |
1293 (interactive "e") | 1294 (interactive "e") |
1294 (let* ((w (posn-window (event-start click))) | 1295 (let* ((w (posn-window (event-start click))) |
1295 (overriding-terminal-local-map nil) | 1296 (overriding-terminal-local-map nil) |
1296 (key (vector (event-basic-type click))) | 1297 (binding (key-binding (this-command-keys-vector) t))) |
1297 ;; FIXME: `key-binding' should accept an event as argument | |
1298 ;; and do all the overlay/text-properties lookup etc... | |
1299 (binding (with-current-buffer | |
1300 (if (window-live-p w) (window-buffer w) (current-buffer)) | |
1301 (key-binding key)))) | |
1302 (if (and (window-minibuffer-p w) | 1298 (if (and (window-minibuffer-p w) |
1303 (not (minibuffer-window-active-p w))) ; in echo area | 1299 (not (minibuffer-window-active-p w))) ; in echo area |
1304 (isearch-yank-x-selection) | 1300 (isearch-yank-x-selection) |
1305 (when (functionp binding) | 1301 (when (functionp binding) |
1306 (call-interactively binding))))) | 1302 (call-interactively binding))))) |
1307 | |
1308 | 1303 |
1309 (defun isearch-yank-internal (jumpform) | 1304 (defun isearch-yank-internal (jumpform) |
1310 "Pull the text from point to the point reached by JUMPFORM. | 1305 "Pull the text from point to the point reached by JUMPFORM. |
1311 JUMPFORM is a lambda expression that takes no arguments and returns a | 1306 JUMPFORM is a lambda expression that takes no arguments and returns a |
1312 buffer position, possibly having moved point to that position. For | 1307 buffer position, possibly having moved point to that position. For |