diff options
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 8 | ||||
| -rw-r--r-- | lisp/emulation/cua-gmrk.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/cua-rect.el | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e7888dbdb0e..2d169e889cd 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -769,7 +769,7 @@ Save a copy in register 0 if `cua-delete-copy-to-register-0' is non-nil." (let ((start (mark)) (end (point))) (or (<= start end) (setq start (prog1 end (setq end start)))) - (setq cua--last-deleted-region-text (buffer-substring start end)) + (setq cua--last-deleted-region-text (filter-buffer-substring start end)) (if cua-delete-copy-to-register-0 (set-register ?0 cua--last-deleted-region-text)) (delete-region start end) @@ -858,7 +858,7 @@ If global mark is active, copy from register or one character." (if regtxt (cua--insert-at-global-mark regtxt) (when (not (eobp)) - (cua--insert-at-global-mark (buffer-substring (point) (+ (point) count))) + (cua--insert-at-global-mark (filter-buffer-substring (point) (+ (point) count))) (forward-char count)))) (buffer-read-only (message "Cannot paste into a read-only buffer")) @@ -875,7 +875,7 @@ If global mark is active, copy from register or one character." (setq paste-lines (cua--delete-rectangle)) (if (= paste-lines 1) (setq paste-lines nil))) ;; paste all - (if (string= (buffer-substring (point) (mark)) + (if (string= (filter-buffer-substring (point) (mark)) (car kill-ring)) (current-kill 1)) (cua-delete-region))) @@ -950,7 +950,7 @@ of text." (setq s (car u) e (cdr u))))))) (setq cua--repeat-replace-text (cond ((and s e (<= s e) (= s (mark t))) - (buffer-substring-no-properties s e)) + (filter-buffer-substring s e nil t)) ((and (null s) (eq u elt)) ;; nothing inserted "") (t diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index c3e6727ab65..842ee9ce0e3 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -143,7 +143,7 @@ With prefix argument, don't jump to global mark when cancelling it." (let ((src-buf (current-buffer))) (save-excursion (if (equal (marker-buffer cua--global-mark-marker) src-buf) - (let ((text (buffer-substring-no-properties start end))) + (let ((text (filter-buffer-substring start end nil t))) (goto-char (marker-position cua--global-mark-marker)) (insert text)) (set-buffer (marker-buffer cua--global-mark-marker)) @@ -167,7 +167,7 @@ With prefix argument, don't jump to global mark when cancelling it." (if (and (< start (marker-position cua--global-mark-marker)) (< (marker-position cua--global-mark-marker) end)) (message "Can't move region into itself") - (let ((text (buffer-substring-no-properties start end)) + (let ((text (filter-buffer-substring start end nil t)) (p1 (copy-marker start)) (p2 (copy-marker end))) (goto-char (marker-position cua--global-mark-marker)) diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 53056d667fb..43a66fd0e3e 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -631,7 +631,7 @@ If command is repeated at same position, delete the rectangle." (if (not (cua--rectangle-virtual-edges)) (cua--rectangle-operation nil nil nil nil nil ; do not tabify '(lambda (s e l r) - (setq rect (cons (buffer-substring-no-properties s e) rect)))) + (setq rect (cons (filter-buffer-substring s e nil t) rect)))) (cua--rectangle-operation nil 1 nil nil nil ; do not tabify '(lambda (s e l r v) (let ((copy t) (bs 0) (as 0) row) @@ -649,7 +649,7 @@ If command is repeated at same position, delete the rectangle." (setq as (- r (max (current-column) l)) e (point))) (setq row (if (and copy (> e s)) - (buffer-substring-no-properties s e) + (filter-buffer-substring s e nil t) "")) (when (> bs 0) (setq row (concat (make-string bs ?\s) row))) @@ -1127,12 +1127,12 @@ The length of STRING need not be the same as the rectangle width." '(lambda (s e l r) (cond ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) - (let* ((txt (buffer-substring-no-properties (match-beginning 1) (match-end 1))) + (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) (n (string-to-number txt 16)) (fmt (format "0x%%0%dx" (length txt)))) (replace-match (format fmt (+ n increment))))) ((re-search-forward "\\( *-?[0-9]+\\)" e t) - (let* ((txt (buffer-substring-no-properties (match-beginning 1) (match-end 1))) + (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) (prefix (if (= (aref txt 0) ?0) "0" "")) (n (string-to-number txt 10)) (fmt (format "%%%s%dd" prefix (length txt)))) @@ -1213,7 +1213,7 @@ The numbers are formatted according to the FORMAT string." (when replace (goto-char (point-min)) (while (not (eobp)) - (setq z (cons (buffer-substring (point) (line-end-position)) z)) + (setq z (cons (filter-buffer-substring (point) (line-end-position)) z)) (forward-line 1)))) (if (not cua--debug) (kill-buffer auxbuf)) |