diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-21 07:33:32 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-21 07:33:32 +0000 |
| commit | 2f42c75fb05cd3c481dc191436e6f1b28669338a (patch) | |
| tree | 15c1eaeaf0eb47a1ee5175d1cbe79728102e0116 /lisp/diff-mode.el | |
| parent | 3b0664df0333a6a53677afa99495852cf81646fd (diff) | |
| download | emacs-2f42c75fb05cd3c481dc191436e6f1b28669338a.tar.gz emacs-2f42c75fb05cd3c481dc191436e6f1b28669338a.tar.bz2 emacs-2f42c75fb05cd3c481dc191436e6f1b28669338a.zip | |
* progmodes/gud.el (gud-target-name): Move definition before use.
* progmodes/dcl-mode.el: Require imenu at compile time.
* progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify
byte-compiler.
* obsolete/fast-lock.el: Use featurep test instead of
string-match.
* eshell/esh-mode.el (eshell-handle-ansi-color): Require
ansi-color at compile time too.
* eshell/em-unix.el (eshell/info): Require info at compile time
too.
* w32-fns.el: Require w32-vars.
* diff-mode.el (diff-refine-hunk): Require smerge-mode at compile
time too.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 34b116d92c8..9e9eb81797a 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -1686,7 +1686,7 @@ For use in `add-log-current-defun-function'." (defun diff-refine-hunk () "Highlight changes of hunk at point at a finer granularity." (interactive) - (require 'smerge-mode) + (eval-and-compile (require 'smerge-mode)) (save-excursion (diff-beginning-of-hunk 'try-harder) (let* ((style (diff-hunk-style)) ;Skips the hunk header as well. |