diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-05 21:07:47 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-05 21:07:47 -0700 |
| commit | 60f884b214cf23093df0a9c82314ebb5c0a3588c (patch) | |
| tree | 70a9e99789e74f79427dfc32f4f829420aaa6564 /lisp/vc | |
| parent | dbdb9a7caedcc8e66a3064ebb362d9ac43f1eee2 (diff) | |
| download | emacs-60f884b214cf23093df0a9c82314ebb5c0a3588c.tar.gz | |
Silence diff-mode.el compilation.
* lisp/vc/diff-mode.el (smerge-refine-subst): Declare.
(diff-refine-hunk): Don't require smerge-mode when compiling.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 5 |
1 files changed, 4 insertions, 1 deletions
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)) |