aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-12-08 00:25:28 +0800
committerChong Yidong2012-12-08 00:25:28 +0800
commit454eb09524ef6e8c25ea7dc8b9fd6fadb0bb1a5c (patch)
tree20c9b7f8f603c8b975c4ec736d0c54f279cc3423
parent75498db059d2719ee30c4bd0d39f8fbcf07582be (diff)
downloademacs-454eb09524ef6e8c25ea7dc8b9fd6fadb0bb1a5c.tar.gz
emacs-454eb09524ef6e8c25ea7dc8b9fd6fadb0bb1a5c.zip
* subr.el (text-clone-maintain): Fix clone overlay deletion
when a syntax is specified. Fixes: debbugs:13025
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/subr.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee551879577..ab351f2a69c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-12-07 Chong Yidong <cyd@gnu.org> 12012-12-07 Chong Yidong <cyd@gnu.org>
2 2
3 * subr.el (text-clone-maintain): Fix clone overlay deletion when a
4 syntax is specified (Bug#13025).
5
3 * info.el (Info-set-mode-line): Remove the file extension from 6 * info.el (Info-set-mode-line): Remove the file extension from
4 Info-current-file if there is one (Bug#13016). 7 Info-current-file if there is one (Bug#13016).
5 8
diff --git a/lisp/subr.el b/lisp/subr.el
index edc2927d673..e08277370a9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3847,7 +3847,7 @@ This is used on the `modification-hooks' property of text clones."
3847 (if (not (re-search-forward 3847 (if (not (re-search-forward
3848 (overlay-get ol1 'text-clone-syntax) cend t)) 3848 (overlay-get ol1 'text-clone-syntax) cend t))
3849 ;; Mark the overlay for deletion. 3849 ;; Mark the overlay for deletion.
3850 (overlay-put ol1 'text-clones nil) 3850 (setq end cbeg)
3851 (when (< (match-end 0) cend) 3851 (when (< (match-end 0) cend)
3852 ;; Shrink the clone at its end. 3852 ;; Shrink the clone at its end.
3853 (setq end (min end (match-end 0))) 3853 (setq end (min end (match-end 0)))