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-mult.el | |
| parent | c7641e3c89bbd310dea7d81da8599823b821057e (diff) | |
| download | emacs-a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5.tar.gz emacs-a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5.tar.bz2 emacs-a5c7df1a4bb8cf7efe5acc7313667a63d7f660c5.zip | |
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-mult.el')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 3e3bc6c9663..58e10819a30 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -110,14 +110,11 @@ :prefix "ediff-" :group 'ediff) - -;; compiler pacifier -(eval-when-compile - (require 'ediff-ptch) - (require 'ediff)) -;; end pacifier - (require 'ediff-init) +(require 'ediff-diff) +(require 'ediff-wind) +(require 'ediff-util) + ;; meta-buffer (ediff-defvar-local ediff-meta-buffer nil "") @@ -1795,6 +1792,14 @@ all marked sessions must be active." )) (error "The patch buffer wasn't found")))) +(declare-function ediff-directories-internal "ediff" + (dir1 dir2 dir3 regexp action jobname + &optional startup-hooks merge-autostore-dir)) + +(declare-function ediff-directory-revisions-internal "ediff" + (dir1 regexp action jobname + &optional startup-hooks merge-autostore-dir)) + ;; This function executes in meta buffer. It knows where event happened. (defun ediff-filegroup-action () @@ -2360,6 +2365,8 @@ If this is a session registry buffer then just bury it." (setq point (point-min))) point)))) +(autoload 'ediff-patch-file-internal "ediff-ptch") + ;; this is the action invoked when the user selects a patch from the meta ;; buffer. (defun ediff-patch-file-form-meta (file &optional startup-hooks) |