From 60f884b214cf23093df0a9c82314ebb5c0a3588c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 5 May 2011 21:07:47 -0700 Subject: [PATCH] Silence diff-mode.el compilation. * lisp/vc/diff-mode.el (smerge-refine-subst): Declare. (diff-refine-hunk): Don't require smerge-mode when compiling. --- lisp/ChangeLog | 5 +++++ lisp/vc/diff-mode.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd26de844fe..2b7830f8726 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-06 Glenn Morris + + * vc/diff-mode.el (smerge-refine-subst): Declare. + (diff-refine-hunk): Don't require smerge-mode when compiling. + 2011-05-06 Juanma Barranquero * simple.el (list-processes): Return nil as the docstring says. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 50f20cea779..22dac00e7e4 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1825,10 +1825,13 @@ For use in `add-log-current-defun-function'." (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)) -- 2.39.5