From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 28 Oct 2008 20:43:44 +0000 (+0000)
Subject: Require diff-mode at run-time as well.
X-Git-Tag: emacs-pretest-23.0.90~2130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2;p=emacs.git

Require diff-mode at run-time as well.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbdd4939fbf..41261a250e8 100644
--- 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 169f5008269..6621e6f6ff7 100644
--- 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.