Mercurial > emacs
comparison lisp/emulation/cua-base.el @ 83676:27d11c1d4e46
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 27 Aug 2007 09:21:49 +0000 |
parents | 2a69b973fae2 0c55974f55f5 |
children | 16efb39cdb2e |
comparison
equal
deleted
inserted
replaced
83675:67601f702028 | 83676:27d11c1d4e46 |
---|---|
905 (setq paste-lines (cua--delete-rectangle)) | 905 (setq paste-lines (cua--delete-rectangle)) |
906 (if (= paste-lines 1) | 906 (if (= paste-lines 1) |
907 (setq paste-lines nil))) ;; paste all | 907 (setq paste-lines nil))) ;; paste all |
908 ;; Before a yank command, make sure we don't yank the | 908 ;; Before a yank command, make sure we don't yank the |
909 ;; head of the kill-ring that really comes from the | 909 ;; head of the kill-ring that really comes from the |
910 ;; currently active region we are going to delete | 910 ;; currently active region we are going to delete. |
911 ;; (when last-command is one that uses copy-region-as-kill | 911 ;; That would make yank a no-op. |
912 ;; or kill-new). That would make yank a no-op. | |
913 (if (and (string= (filter-buffer-substring (point) (mark)) | 912 (if (and (string= (filter-buffer-substring (point) (mark)) |
914 (car kill-ring)) | 913 (car kill-ring)) |
915 (memq last-command | 914 (mouse-region-match)) |
916 '(mouse-set-region mouse-drag-region | |
917 mouse-save-then-kill mouse-secondary-save-then-kill))) | |
918 (current-kill 1)) | 915 (current-kill 1)) |
919 (cua-delete-region))) | 916 (cua-delete-region))) |
920 (cond | 917 (cond |
921 (regtxt | 918 (regtxt |
922 (cond | 919 (cond |