From: Glenn Morris <rgm@gnu.org>
Date: Fri, 6 May 2011 04:07:47 +0000 (-0700)
Subject: Silence diff-mode.el compilation.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60f884b214cf23093df0a9c82314ebb5c0a3588c;p=emacs.git

Silence diff-mode.el compilation.

* lisp/vc/diff-mode.el (smerge-refine-subst): Declare.
(diff-refine-hunk): Don't require smerge-mode when compiling.
---

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