comparison lisp/emulation/cua-gmrk.el @ 90384:c156f6a9e7b5

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 204-225) - Update from CVS - Sync from erc--emacs--0 - Merge from gnus--rel--5.10 - Improve tq.el. - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. * gnus--rel--5.10 (patch 81-85) - Update from CVS - Merge from emacs--devo--0
author Miles Bader <miles@gnu.org>
date Mon, 17 Apr 2006 08:41:12 +0000
parents c5406394f567 eea8aee5048b
children 95d0cdf160ea
comparison
equal deleted inserted replaced
90383:ab20fb198dda 90384:c156f6a9e7b5
141 (interactive "r") 141 (interactive "r")
142 (if (cua--global-mark-active) 142 (if (cua--global-mark-active)
143 (let ((src-buf (current-buffer))) 143 (let ((src-buf (current-buffer)))
144 (save-excursion 144 (save-excursion
145 (if (equal (marker-buffer cua--global-mark-marker) src-buf) 145 (if (equal (marker-buffer cua--global-mark-marker) src-buf)
146 (let ((text (buffer-substring-no-properties start end))) 146 (let ((text (filter-buffer-substring start end nil t)))
147 (goto-char (marker-position cua--global-mark-marker)) 147 (goto-char (marker-position cua--global-mark-marker))
148 (insert text)) 148 (insert text))
149 (set-buffer (marker-buffer cua--global-mark-marker)) 149 (set-buffer (marker-buffer cua--global-mark-marker))
150 (goto-char (marker-position cua--global-mark-marker)) 150 (goto-char (marker-position cua--global-mark-marker))
151 (insert-buffer-substring-as-yank src-buf start end)) 151 (insert-buffer-substring-as-yank src-buf start end))
165 (save-excursion 165 (save-excursion
166 (if (equal (marker-buffer cua--global-mark-marker) src-buf) 166 (if (equal (marker-buffer cua--global-mark-marker) src-buf)
167 (if (and (< start (marker-position cua--global-mark-marker)) 167 (if (and (< start (marker-position cua--global-mark-marker))
168 (< (marker-position cua--global-mark-marker) end)) 168 (< (marker-position cua--global-mark-marker) end))
169 (message "Can't move region into itself") 169 (message "Can't move region into itself")
170 (let ((text (buffer-substring-no-properties start end)) 170 (let ((text (filter-buffer-substring start end nil t))
171 (p1 (copy-marker start)) 171 (p1 (copy-marker start))
172 (p2 (copy-marker end))) 172 (p2 (copy-marker end)))
173 (goto-char (marker-position cua--global-mark-marker)) 173 (goto-char (marker-position cua--global-mark-marker))
174 (insert text) 174 (insert text)
175 (cua--activate-global-mark) 175 (cua--activate-global-mark)