Mercurial > emacs
diff lisp/smerge-mode.el @ 76397:e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
(debug-ignored-errors): Add entry from smerge-match-conflict.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 08 Mar 2007 20:12:55 +0000 |
parents | e3694f1cb928 |
children | 9355f9b7bbff 738ce3540ffb 91bf6e05918b |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Thu Mar 08 18:31:13 2007 +0000 +++ b/lisp/smerge-mode.el Thu Mar 08 20:12:55 2007 +0000 @@ -345,7 +345,9 @@ ;; during font-locking so inhibit-modification-hooks is non-nil, so we ;; can't just modify the buffer and expect font-lock to be triggered as in: ;; (put-text-property beg end 'smerge-force-highlighting nil) - (remove-text-properties beg end '(fontified nil))) + (let ((modified (buffer-modified-p))) + (remove-text-properties beg end '(fontified nil)) + (restore-buffer-modified-p modified))) (defun smerge-popup-context-menu (event) "Pop up the Smerge mode context menu under mouse." @@ -558,6 +560,8 @@ t) (search-failed (error "Point not in conflict region"))))) +(add-to-list 'debug-ignored-errors "Point not in conflict region") + (defun smerge-conflict-overlay (pos) "Return the conflict overlay at POS if any." (let ((ols (overlays-at pos))