diff lisp/diff-mode.el @ 85503:59ee4068f60b

* 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.

--- a/lisp/diff-mode.el	Sun Oct 21 03:39:23 2007 +0000
+++ b/lisp/diff-mode.el	Sun Oct 21 07:33:32 2007 +0000
@@ -1686,7 +1686,7 @@
 (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.