[Emacs-diffs] /srv/bzr/emacs/trunk r100172: * cua-base.el, cua-gmrk.el: Fix use of `filter-buffer-substring'.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100172
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 02:46:09 +0200
message:
  * cua-base.el, cua-gmrk.el: Fix use of `filter-buffer-substring'.
modified:
  lisp/ChangeLog
  lisp/emulation/cua-base.el
  lisp/emulation/cua-gmrk.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-06 08:40:06 +0000
+++ b/lisp/ChangeLog    2010-05-07 00:46:09 +0000
@@ -1,3 +1,11 @@
+2010-05-07  Juanma Barranquero  <address@hidden>
+
+       Fix use of `filter-buffer-substring' (4th arg NOPROPS removed).
+       * emulation/cua-base.el (cua-repeat-replace-region):
+       * emulation/cua-gmrk.el (cua-copy-region-to-global-mark)
+       (cua-cut-region-to-global-mark):
+       Remove text properties with `set-text-properties'.
+
 2010-05-06  Michael Albinus  <address@hidden>
 
        * net/tramp.el (top, with-progress-reporter): Use

=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el        2010-04-05 23:38:53 +0000
+++ b/lisp/emulation/cua-base.el        2010-05-07 00:46:09 +0000
@@ -1040,7 +1040,9 @@
                  (setq s (car u) e (cdr u)))))))
          (cond ((and s e (<= s e) (= s (mark t)))
                 (setq cua--repeat-replace-text
-                      (filter-buffer-substring s e nil t)))
+                      (filter-buffer-substring s e))
+                (set-text-properties 0 (length cua--repeat-replace-text)
+                                     nil cua--repeat-replace-text))
                ((and (null s) (eq u elt)) ;; nothing inserted
                 (setq cua--repeat-replace-text
                       ""))

=== modified file 'lisp/emulation/cua-gmrk.el'
--- a/lisp/emulation/cua-gmrk.el        2010-01-13 08:35:10 +0000
+++ b/lisp/emulation/cua-gmrk.el        2010-05-07 00:46:09 +0000
@@ -137,8 +137,9 @@
       (let ((src-buf (current-buffer)))
        (save-excursion
          (if (equal (marker-buffer cua--global-mark-marker) src-buf)
-             (let ((text (filter-buffer-substring start end nil t)))
+             (let ((text (filter-buffer-substring start end)))
                (goto-char (marker-position cua--global-mark-marker))
+               (set-text-properties 0 (length text) text)
                (insert text))
            (set-buffer (marker-buffer cua--global-mark-marker))
            (goto-char (marker-position cua--global-mark-marker))
@@ -161,10 +162,11 @@
              (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 (filter-buffer-substring start end nil t))
+               (let ((text (filter-buffer-substring start end))
                      (p1 (copy-marker start))
                      (p2 (copy-marker end)))
                  (goto-char (marker-position cua--global-mark-marker))
+                 (set-text-properties 0 (length text) text)
                  (insert text)
                  (cua--activate-global-mark)
                  (delete-region (marker-position p1) (marker-position p2))