From: Stefan Monnier Date: Thu, 8 Mar 2007 20:12:55 +0000 (+0000) Subject: (smerge-remove-props): Don't mark the buffer modified. X-Git-Tag: emacs-pretest-22.0.96~195 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0778a62fff458712383895e429ee46242f64d553;p=emacs.git (smerge-remove-props): Don't mark the buffer modified. (debug-ignored-errors): Add entry from smerge-match-conflict. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e683efb937a..b4c3dc3d8ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-03-08 Stefan Monnier + + * 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 * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit @@ -7,9 +12,9 @@ 2007-03-08 Chong Yidong - * 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 * 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 diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index bda569a1e05..8e239ab5a26 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -345,7 +345,9 @@ according to `smerge-match-conflict'.") ;; 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 @@ An error is raised if not inside a conflict." 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))