Commit 755e0210 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(smerge-remove-props, smerge-refine):

Use with-silent-modifications (bug#4342).
parent 83a5aac5
2009-09-08 Stefan Monnier <monnier@iro.umontreal.ca> 2009-09-08 Stefan Monnier <monnier@iro.umontreal.ca>
* smerge-mode.el (smerge-remove-props, smerge-refine):
Use with-silent-modifications (bug#4342).
* subr.el (with-silent-modifications): New macro. * subr.el (with-silent-modifications): New macro.
2009-09-07 Juanma Barranquero <lekktu@gmail.com> 2009-09-07 Juanma Barranquero <lekktu@gmail.com>
......
...@@ -367,9 +367,8 @@ according to `smerge-match-conflict'.") ...@@ -367,9 +367,8 @@ according to `smerge-match-conflict'.")
;; during font-locking so inhibit-modification-hooks is non-nil, so we ;; 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: ;; can't just modify the buffer and expect font-lock to be triggered as in:
;; (put-text-property beg end 'smerge-force-highlighting nil) ;; (put-text-property beg end 'smerge-force-highlighting nil)
(let ((modified (buffer-modified-p))) (with-silent-modifications
(remove-text-properties beg end '(fontified nil)) (remove-text-properties beg end '(fontified nil))))
(restore-buffer-modified-p modified)))
(defun smerge-popup-context-menu (event) (defun smerge-popup-context-menu (event)
"Pop up the Smerge mode context menu under mouse." "Pop up the Smerge mode context menu under mouse."
...@@ -1015,9 +1014,10 @@ repeating the command will highlight other 2 parts." ...@@ -1015,9 +1014,10 @@ repeating the command will highlight other 2 parts."
(n2 (if (eq part 3) 2 3))) (n2 (if (eq part 3) 2 3)))
(smerge-ensure-match n1) (smerge-ensure-match n1)
(smerge-ensure-match n2) (smerge-ensure-match n2)
(put-text-property (match-beginning 0) (1+ (match-beginning 0)) (with-silent-modifications
'smerge-refine-part (put-text-property (match-beginning 0) (1+ (match-beginning 0))
(cons (buffer-chars-modified-tick) part)) 'smerge-refine-part
(cons (buffer-chars-modified-tick) part)))
(smerge-refine-subst (match-beginning n1) (match-end n1) (smerge-refine-subst (match-beginning n1) (match-end n1)
(match-beginning n2) (match-end n2) (match-beginning n2) (match-end n2)
'((smerge . refine) '((smerge . refine)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment