diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-07 23:22:48 +0000 |
| commit | dbc3b08c405a7b1c0ddb0fb0c98164b355802af5 (patch) | |
| tree | 00c6f28244409d14bec11e221fb3c03daef63fc6 /lisp/mouse.el | |
| parent | bbb6e8f2b6037dc1ee4ddd6cb63a1a6ddb04a591 (diff) | |
| parent | 86cb14475e9e76f0b3323d2e7110a4a2bd310cdb (diff) | |
| download | emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.tar.gz emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.tar.bz2 emacs-dbc3b08c405a7b1c0ddb0fb0c98164b355802af5.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 490-504)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 161-163)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 0b6cccd86c6..a5f208baf11 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -846,7 +846,7 @@ at the same position." ;; Should we instead decide that `action' takes a `posn'? (if (consp pos) (with-current-buffer (window-buffer (posn-window pos)) - (funcall action (posn-point pos))) + (funcall action (posn-point pos))) (funcall action pos))) (t action)))) @@ -889,7 +889,7 @@ at the same position." (let ((range (mouse-start-end start end mode))) (move-overlay ol (car range) (nth 1 range)))) -(defun mouse-drag-track (start-event &optional +(defun mouse-drag-track (start-event &optional do-mouse-drag-region-post-process) "Track mouse drags by highlighting area between point and cursor. The region will be defined with mark and point, and the overlay @@ -983,8 +983,8 @@ should only be used by mouse-drag-region." (let* ((fun (key-binding (vector (car event)))) (do-multi-click (and (> (event-click-count event) 0) (functionp fun) - (not (memq fun - '(mouse-set-point + (not (memq fun + '(mouse-set-point mouse-set-region)))))) ;; Run the binding of the terminating up-event, if possible. (if (and (not (= (overlay-start mouse-drag-overlay) @@ -2377,7 +2377,7 @@ and selects that window." "X fonts suitable for use in Emacs.") (defun mouse-set-font (&rest fonts) - "Select an emacs font from a list of known good fonts and fontsets." + "Select an Emacs font from a list of known good fonts and fontsets." (interactive (progn (unless (display-multi-font-p) (error "Cannot change fonts on this display")) |