Require diff-mode at run-time as well.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbdd4939fbf792dd4c9c2caf09c8133a4fce9ebb..41261a250e8cad43f3b7ec5af36f194e9acf2de3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * smerge-mode.el: Require diff-mode at run-time as well.
+
 2008-10-28  Martin Rudalics  <rudalics@gmx.at>
 
        * vc-cvs.el (vc-cvs-stay-local): Fix typo in choice.

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 169f50082690439a0a57d49261446a842e210462..6621e6f6ff727b71636ed6cdc145d6d59289218e 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -44,7 +44,8 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl) (require 'diff-mode))
+(eval-when-compile (require 'cl))
+(require 'diff-mode)                    ;For diff-auto-refine-mode.
 
 
 ;;; The real definition comes later.