[Emacs-diffs] /srv/bzr/emacs/trunk r104132: Silence diff-mode.el compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 104132
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-05 21:07:47 -0700
message:
  Silence diff-mode.el compilation.
  
  * lisp/vc/diff-mode.el (smerge-refine-subst): Declare.
  (diff-refine-hunk): Don't require smerge-mode when compiling.
modified:
  lisp/ChangeLog
  lisp/vc/diff-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-06 01:02:49 +0000
+++ b/lisp/ChangeLog    2011-05-06 04:07:47 +0000
@@ -1,3 +1,8 @@
+2011-05-06  Glenn Morris  <address@hidden>
+
+       * vc/diff-mode.el (smerge-refine-subst): Declare.
+       (diff-refine-hunk): Don't require smerge-mode when compiling.
+
 2011-05-06  Juanma Barranquero  <address@hidden>
 
        * simple.el (list-processes): Return nil as the docstring says.

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2011-03-21 16:42:16 +0000
+++ b/lisp/vc/diff-mode.el      2011-05-06 04:07:47 +0000
@@ -1825,10 +1825,13 @@
     (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))