diff options
| author | Stefan Monnier | 2008-10-28 20:43:44 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-10-28 20:43:44 +0000 |
| commit | a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2 (patch) | |
| tree | 614b28e4554f38245d7e749d2c6b9983048d45d6 | |
| parent | 170ddd9772078946383d2bef418e0db5d83c7655 (diff) | |
| download | emacs-a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2.tar.gz emacs-a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2.zip | |
Require diff-mode at run-time as well.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fbdd4939fbf..41261a250e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-10-28 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * smerge-mode.el: Require diff-mode at run-time as well. | ||
| 4 | |||
| 1 | 2008-10-28 Martin Rudalics <rudalics@gmx.at> | 5 | 2008-10-28 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * vc-cvs.el (vc-cvs-stay-local): Fix typo in choice. | 7 | * 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 @@ | |||
| 44 | 44 | ||
| 45 | ;;; Code: | 45 | ;;; Code: |
| 46 | 46 | ||
| 47 | (eval-when-compile (require 'cl) (require 'diff-mode)) | 47 | (eval-when-compile (require 'cl)) |
| 48 | (require 'diff-mode) ;For diff-auto-refine-mode. | ||
| 48 | 49 | ||
| 49 | 50 | ||
| 50 | ;;; The real definition comes later. | 51 | ;;; The real definition comes later. |