diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
| commit | 62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf (patch) | |
| tree | 9e21647ad3ab0f43ea02d372adc4cfa9947e5309 /lisp/emulation/cua-base.el | |
| parent | 9005667b3381a785759a996e00fb1acfd126eecc (diff) | |
| parent | 83cc8d356afe3bfd68da74b822549e02047ed041 (diff) | |
| download | emacs-62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
Diffstat (limited to 'lisp/emulation/cua-base.el')
| -rw-r--r-- | lisp/emulation/cua-base.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 323cad15276..5e18953752a 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -907,14 +907,11 @@ If global mark is active, copy from register or one character." (setq paste-lines nil))) ;; paste all ;; Before a yank command, make sure we don't yank the ;; head of the kill-ring that really comes from the - ;; currently active region we are going to delete - ;; (when last-command is one that uses copy-region-as-kill - ;; or kill-new). That would make yank a no-op. + ;; currently active region we are going to delete. + ;; That would make yank a no-op. (if (and (string= (filter-buffer-substring (point) (mark)) (car kill-ring)) - (memq last-command - '(mouse-set-region mouse-drag-region - mouse-save-then-kill mouse-secondary-save-then-kill))) + (mouse-region-match)) (current-kill 1)) (cua-delete-region))) (cond |