HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
(looking-back): Fix doc-string typo.
[bpt/emacs.git]
/
lisp
/
smerge-mode.el
diff --git
a/lisp/smerge-mode.el
b/lisp/smerge-mode.el
index
169f500
..
6621e6f
100644
(file)
--- 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.