1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3f2bb12e5d..59760e276c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-21  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+        * diff-mode.el (diff-auto-refine): Delete defcustom.
+        (diff-auto-refine-mode): New func/var via define-minor-mode.
+        Update var ref to use diff-auto-refine-mode.
+        * smerge-mode.el (diff-mode): Require when compiling.
+        (smerge-auto-refine): Delete defcustom.
+        Update smerge-auto-refine ref to use diff-auto-refine-mode.
+
 2008-07-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * simple.el (visual-line): New custom group.