diff options
| author | Stefan Monnier <[email protected]> | 2008-10-28 20:43:44 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-10-28 20:43:44 +0000 |
| commit | a8028e7bcf9ce0137b3e5b49b3dc85307c2610c2 (patch) | |
| tree | 614b28e4554f38245d7e749d2c6b9983048d45d6 /lisp/smerge-mode.el | |
| parent | 170ddd9772078946383d2bef418e0db5d83c7655 (diff) | |
Require diff-mode at run-time as well.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 169f500826..6621e6f6ff 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. |