aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/mouse.el
diff options
context:
space:
mode:
authorKaroly Lorentey2004-11-06 17:52:02 +0000
committerKaroly Lorentey2004-11-06 17:52:02 +0000
commit65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb (patch)
tree853cf391ca1abda4f4ccd6fe8e7bb43f7c86ee08 /lisp/mouse.el
parente0bc17abe6979d607e8de4684dddb96e53c60065 (diff)
parent392cf16dd0ee9358f8af0cd0d8048b822456bbeb (diff)
downloademacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.tar.gz
emacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656 Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
Diffstat (limited to 'lisp/mouse.el')
-rw-r--r--lisp/mouse.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8f05324d84d..865b5e96297 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1068,8 +1068,7 @@ If MODE is 2 then do the same for lines."
1068 (unless ignore 1068 (unless ignore
1069 ;; For certain special keys, delete the region. 1069 ;; For certain special keys, delete the region.
1070 (if (member key mouse-region-delete-keys) 1070 (if (member key mouse-region-delete-keys)
1071 (delete-region (overlay-start mouse-drag-overlay) 1071 (delete-region (mark t) (point))
1072 (overlay-end mouse-drag-overlay))
1073 ;; Otherwise, unread the key so it gets executed normally. 1072 ;; Otherwise, unread the key so it gets executed normally.
1074 (setq unread-command-events 1073 (setq unread-command-events
1075 (nconc events unread-command-events)))) 1074 (nconc events unread-command-events))))
@@ -1112,7 +1111,7 @@ and set mark at the beginning.
1112Prefix arguments are interpreted as with \\[yank]. 1111Prefix arguments are interpreted as with \\[yank].
1113If `mouse-yank-at-point' is non-nil, insert at point 1112If `mouse-yank-at-point' is non-nil, insert at point
1114regardless of where you click." 1113regardless of where you click."
1115 (interactive "*e\nP") 1114 (interactive "e\nP")
1116 ;; Give temporary modes such as isearch a chance to turn off. 1115 ;; Give temporary modes such as isearch a chance to turn off.
1117 (run-hooks 'mouse-leave-buffer-hook) 1116 (run-hooks 'mouse-leave-buffer-hook)
1118 (or mouse-yank-at-point (mouse-set-point click)) 1117 (or mouse-yank-at-point (mouse-set-point click))
@@ -1414,7 +1413,7 @@ The function returns a non-nil value if it creates a secondary selection."
1414Move point to the end of the inserted text. 1413Move point to the end of the inserted text.
1415If `mouse-yank-at-point' is non-nil, insert at point 1414If `mouse-yank-at-point' is non-nil, insert at point
1416regardless of where you click." 1415regardless of where you click."
1417 (interactive "*e") 1416 (interactive "e")
1418 ;; Give temporary modes such as isearch a chance to turn off. 1417 ;; Give temporary modes such as isearch a chance to turn off.
1419 (run-hooks 'mouse-leave-buffer-hook) 1418 (run-hooks 'mouse-leave-buffer-hook)
1420 (or mouse-yank-at-point (mouse-set-point click)) 1419 (or mouse-yank-at-point (mouse-set-point click))