From a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 28 Oct 2008 20:43:44 +0000 Subject: [PATCH] Require diff-mode at run-time as well. --- lisp/ChangeLog | 4 ++++ lisp/smerge-mode.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * smerge-mode.el: Require diff-mode at run-time as well. + 2008-10-28 Martin Rudalics * 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. -- 2.39.2