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

Use with-silent-modifications (bug#4342).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53e0cd9825bd813e90e860cd39cbeca4242ceca1..e19c4e723a33fedad08f397c3a9a9f7adfd1db01 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 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.
 
 2009-09-07  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 289c4afd98357da5fec45f36623a226ca348ed60..0e72d4c233a57a635ab2087441f8a7676bcc64bd 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -367,9 +367,8 @@ 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)
-  (let ((modified (buffer-modified-p)))
-    (remove-text-properties beg end '(fontified nil))
-    (restore-buffer-modified-p modified)))
+  (with-silent-modifications
+    (remove-text-properties beg end '(fontified nil))))
 
 (defun smerge-popup-context-menu (event)
   "Pop up the Smerge mode context menu under mouse."
@@ -1015,9 +1014,10 @@ repeating the command will highlight other 2 parts."
         (n2 (if (eq part 3) 2 3)))
     (smerge-ensure-match n1)
     (smerge-ensure-match n2)
-    (put-text-property (match-beginning 0) (1+ (match-beginning 0))
-                       'smerge-refine-part
-                       (cons (buffer-chars-modified-tick) part))
+    (with-silent-modifications
+      (put-text-property (match-beginning 0) (1+ (match-beginning 0))
+                         'smerge-refine-part
+                         (cons (buffer-chars-modified-tick) part)))
     (smerge-refine-subst (match-beginning n1) (match-end n1)
                          (match-beginning n2)  (match-end n2)
                          '((smerge . refine)