# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1225226624 0
# Node ID 35155d8e53608a73a5ba66722c8c5e25840b813d
# Parent  524aa12967426a52b2569d2f88ddca11275beb5f
Require diff-mode at run-time as well.

diff -r 524aa1296742 -r 35155d8e5360 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 28 20:16:18 2008 +0000
+++ b/lisp/ChangeLog	Tue Oct 28 20:43:44 2008 +0000
@@ -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 -r 524aa1296742 -r 35155d8e5360 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Tue Oct 28 20:16:18 2008 +0000
+++ b/lisp/smerge-mode.el	Tue Oct 28 20:43:44 2008 +0000
@@ -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.