Mercurial > emacs
changeset 99196:35155d8e5360
Require diff-mode at run-time as well.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 28 Oct 2008 20:43:44 +0000 |
| parents | 524aa1296742 |
| children | 7548cef42245 |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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.