diff options
| author | Karoly Lorentey <[email protected]> | 2006-05-24 09:13:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-05-24 09:13:31 +0000 |
| commit | 40a1b46245c1a8786324f5a06d6cb8d4bd9d5b74 (patch) | |
| tree | f45020695e190f511f4faf4dd3ed144059f298c0 /lisp/simple.el | |
| parent | dbe9f5ba9648890dc34f4836a49fde766b21ce74 (diff) | |
| parent | 4ea5193b9cc5c577127ca6c89ecfaad819398d3b (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-289
Update from CVS
* [email protected]/emacs--devo--0--patch-290
Update from CVS
* [email protected]/emacs--devo--0--patch-291
Update from CVS
* [email protected]/emacs--devo--0--patch-292
Update from CVS
* [email protected]/emacs--devo--0--patch-293
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-567
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 0e46b5969f..a2f21465fa 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2541,7 +2541,9 @@ to make one entry in the kill ring. In Lisp code, optional third arg YANK-HANDLER, if non-nil, specifies the yank-handler text property to be set on the killed text. See `insert-for-yank'." - (interactive "r") + ;; Pass point first, then mark, because the order matters + ;; when calling kill-append. + (interactive (list (point) (mark))) (condition-case nil (let ((string (filter-buffer-substring beg end t))) (when string ;STRING is nil if BEG = END @@ -3635,10 +3637,14 @@ Outline mode sets this." (setq new (point)) ;; Process intangibility within a line. - ;; Move to the chosen destination position from above, - ;; with intangibility processing enabled. - - ;; Avoid calling point-entered and point-left. + ;; With inhibit-point-motion-hooks bound to nil, a call to + ;; goto-char moves point past intangible text. + + ;; However, inhibit-point-motion-hooks controls both the + ;; intangibility and the point-entered/point-left hooks. The + ;; following hack avoids calling the point-* hooks + ;; unnecessarily. Note that we move *forward* past intangible + ;; text when the initial and final points are the same. (goto-char new) (let ((inhibit-point-motion-hooks nil)) (goto-char new) |