[Emacs-diffs] /srv/bzr/emacs/trunk r111147: * subr.el (text-clone-maintain): Fix clone overlay deletion

[Chong Yidong]

------------------------------------------------------------
revno: 111147
fixes bug: http://debbugs.gnu.org/13025
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-08 00:25:28 +0800
message:
  * subr.el (text-clone-maintain): Fix clone overlay deletion
  when a syntax is specified.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-07 15:31:43 +0000
+++ b/lisp/ChangeLog    2012-12-07 16:25:28 +0000
@@ -1,5 +1,8 @@
 2012-12-07  Chong Yidong  <address@hidden>
 
+       * subr.el (text-clone-maintain): Fix clone overlay deletion when a
+       syntax is specified (Bug#13025).
+
        * info.el (Info-set-mode-line): Remove the file extension from
        Info-current-file if there is one (Bug#13016).
 

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-12-07 02:37:20 +0000
+++ b/lisp/subr.el      2012-12-07 16:25:28 +0000
@@ -3847,7 +3847,7 @@
                (if (not (re-search-forward
                          (overlay-get ol1 'text-clone-syntax) cend t))
                    ;; Mark the overlay for deletion.
-                   (overlay-put ol1 'text-clones nil)
+                   (setq end cbeg)
                  (when (< (match-end 0) cend)
                    ;; Shrink the clone at its end.
                    (setq end (min end (match-end 0)))