[Emacs-diffs] emacs/lisp ChangeLog smerge-mode.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/08 19:47:10

Modified files:
        lisp           : ChangeLog smerge-mode.el 

Log message:
        (smerge-remove-props, smerge-refine):
        Use with-silent-modifications (bug#4342).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16112&r2=1.16113
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.77&r2=1.78

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16112
retrieving revision 1.16113
diff -u -b -r1.16112 -r1.16113
--- ChangeLog   8 Sep 2009 19:42:22 -0000       1.16112
+++ ChangeLog   8 Sep 2009 19:47:07 -0000       1.16113
@@ -1,5 +1,8 @@
 2009-09-08  Stefan Monnier  <address@hidden>
 
+       * 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  <address@hidden>

Index: smerge-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- smerge-mode.el      1 Sep 2009 07:24:19 -0000       1.77
+++ smerge-mode.el      8 Sep 2009 19:47:10 -0000       1.78
@@ -367,9 +367,8 @@
   ;; 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 @@
         (n2 (if (eq part 3) 2 3)))
     (smerge-ensure-match n1)
     (smerge-ensure-match n2)
+    (with-silent-modifications
     (put-text-property (match-beginning 0) (1+ (match-beginning 0))
                        'smerge-refine-part
-                       (cons (buffer-chars-modified-tick) part))
+                         (cons (buffer-chars-modified-tick) part)))
     (smerge-refine-subst (match-beginning n1) (match-end n1)
                          (match-beginning n2)  (match-end n2)
                          '((smerge . refine)