diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 3 | ||||
-rw-r--r-- | lisp/subr.el | 2 |
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 @@ 2012-12-07 Chong Yidong <cyd@gnu.org> + * 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). 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." (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))) |