diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-23 00:10:05 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-23 00:10:05 -0700 |
| commit | a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5 (patch) | |
| tree | dc0d5211d6755a5af10dcafae131047fa7ed3889 /lisp/vc/ediff-util.el | |
| parent | c7641e3c89bbd310dea7d81da8599823b821057e (diff) | |
| download | emacs-a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5.tar.gz | |
Silence ediff compilation
* lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time.
* lisp/vc/ediff-mult.el: Adjust requires.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-patch-file-internal): Declare.
* lisp/vc/ediff-ptch.el: Adjust requires.
(ediff-use-last-dir, ediff-buffers-internal): Declare.
(ediff-find-file): Autoload.
* lisp/vc/ediff-util.el: No need to load ediff when compiling.
(ediff-regions-internal): Declare.
* lisp/vc/ediff-wind.el: Adjust requires.
(ediff-compute-toolbar-width): Define when compiling.
(ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.
* lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling.
(dired-get-filename, dired-get-marked-files)
(ediff-last-dir-patch, ediff-patch-default-directory)
(ediff-get-patch-buffer, ediff-dispatch-file-patching-job)
(ediff-patch-buffer-internal): Declare.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 81146c0c931..ec227f44e8f 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -42,9 +42,6 @@ (eval-and-compile (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) -(eval-when-compile - (require 'ediff)) - ;; end pacifier @@ -3477,6 +3474,9 @@ Without an argument, it saves customized diff argument, if available (if (window-live-p ediff-control-window) (select-window ediff-control-window))) +(declare-function ediff-regions-internal "ediff" + (buffer-a beg-a end-a buffer-b beg-b end-b + startup-hooks job-name word-mode setup-parameters)) (defun ediff-inferior-compare-regions () "Compare regions in an active Ediff session. |