Mercurial > emacs
changeset 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 | b63d1410b51c |
| children | c4a8c9e4445b |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 08 18:31:13 2007 +0000 +++ b/lisp/ChangeLog Thu Mar 08 20:12:55 2007 +0000 @@ -1,3 +1,8 @@ +2007-03-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * smerge-mode.el (smerge-remove-props): Don't mark the buffer modified. + (debug-ignored-errors): Add entry from smerge-match-conflict. + 2007-03-08 J.D. Smith <jdsmith@as.arizona.edu> * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit @@ -7,9 +12,9 @@ 2007-03-08 Chong Yidong <cyd@stupidchicken.com> - * replace.el (occur-engine): buffer-undo-list binding moved... + * replace.el (occur-engine): Move buffer-undo-list binding... (occur-1): ...to here. - + * complete.el (PC-bindings): Rebind M-TAB in read-expression-map. * simple.el (minibuffer-completing-symbol): New var. @@ -25,8 +30,8 @@ 2007-03-07 Miles Bader <miles@gnu.org> * international/isearch-x.el - (isearch-process-search-multibyte-characters): Strip - text-properties from PROMPT to avoid an error from read-string. + (isearch-process-search-multibyte-characters): + Strip text-properties from PROMPT to avoid an error from read-string. 2007-03-07 Kim F. Storm <storm@cua.dk>
--- 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))