* lisp/vc/diff-mode.el (smerge-refine-subst): Declare.
(diff-refine-hunk): Don't require smerge-mode when compiling.
+2011-05-06 Glenn Morris <rgm@gnu.org>
+
+ * vc/diff-mode.el (smerge-refine-subst): Declare.
+ (diff-refine-hunk): Don't require smerge-mode when compiling.
+
2011-05-06 Juanma Barranquero <lekktu@gmail.com>
* simple.el (list-processes): Return nil as the docstring says.
(replace-match (cdr (assq (char-before) '((?+ . "-") (?> . "<"))))))
)
+(declare-function smerge-refine-subst "smerge-mode"
+ (beg1 end1 beg2 end2 props &optional preproc))
+
(defun diff-refine-hunk ()
"Highlight changes of hunk at point at a finer granularity."
(interactive)
- (eval-and-compile (require 'smerge-mode))
+ (require 'smerge-mode)
(save-excursion
(diff-beginning-of-hunk 'try-harder)
(let* ((start (point))