[Emacs-diffs] /srv/bzr/emacs/trunk r112680: Silence ediff compilation

[Glenn Morris]

------------------------------------------------------------
revno: 112680
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-23 00:10:05 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-diff.el
  lisp/vc/ediff-merg.el
  lisp/vc/ediff-mult.el
  lisp/vc/ediff-ptch.el
  lisp/vc/ediff-util.el
  lisp/vc/ediff-wind.el
  lisp/vc/ediff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-23 05:01:59 +0000
+++ b/lisp/ChangeLog    2013-05-23 07:10:05 +0000
@@ -1,5 +1,23 @@
 2013-05-23  Glenn Morris  <address@hidden>
 
+       * vc/ediff-diff.el, vc/ediff-merg.el: Require ediff-util at run-time.
+       * vc/ediff-mult.el: Adjust requires.
+       (ediff-directories-internal, ediff-directory-revisions-internal)
+       (ediff-patch-file-internal): Declare.
+       * vc/ediff-ptch.el: Adjust requires.
+       (ediff-use-last-dir, ediff-buffers-internal): Declare.
+       (ediff-find-file): Autoload.
+       * vc/ediff-util.el: No need to load ediff when compiling.
+       (ediff-regions-internal): Declare.
+       * vc/ediff-wind.el: Adjust requires.
+       (ediff-compute-toolbar-width): Define when compiling.
+       (ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.
+       * 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.
+
        * emacs-lisp/checkdoc.el: No need to load ispell when compiling.
        (ispell-process, ispell-buffer-local-words, lm-summary)
        (lm-section-start, lm-section-end): Declare.

=== modified file 'lisp/vc/ediff-diff.el'
--- a/lisp/vc/ediff-diff.el     2013-01-02 16:13:04 +0000
+++ b/lisp/vc/ediff-diff.el     2013-05-23 07:10:05 +0000
@@ -27,10 +27,8 @@
 
 (provide 'ediff-diff)
 
-(eval-when-compile
-  (require 'ediff-util))
-
 (require 'ediff-init)
+(require 'ediff-util)
 
 (defgroup ediff-diff nil
   "Diff related utilities."

=== modified file 'lisp/vc/ediff-merg.el'
--- a/lisp/vc/ediff-merg.el     2013-01-01 09:11:05 +0000
+++ b/lisp/vc/ediff-merg.el     2013-05-23 07:10:05 +0000
@@ -32,11 +32,8 @@
 (defvar ediff-merge-window-share)
 (defvar ediff-window-config-saved)
 
-(eval-when-compile
-  (require 'ediff-util))
-;; end pacifier
-
 (require 'ediff-init)
+(require 'ediff-util)
 
 (defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge
   "Hooks to run before quitting a merge job.

=== modified file 'lisp/vc/ediff-mult.el'
--- a/lisp/vc/ediff-mult.el     2013-01-01 09:11:05 +0000
+++ b/lisp/vc/ediff-mult.el     2013-05-23 07:10:05 +0000
@@ -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 @@
            ))
       (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 @@
            (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)

=== modified file 'lisp/vc/ediff-ptch.el'
--- a/lisp/vc/ediff-ptch.el     2013-01-02 16:13:04 +0000
+++ b/lisp/vc/ediff-ptch.el     2013-05-23 07:10:05 +0000
@@ -33,12 +33,8 @@
   :prefix "ediff-"
   :group 'ediff)
 
-;; compiler pacifier
-(eval-when-compile
-  (require 'ediff))
-;; end pacifier
-
 (require 'ediff-init)
+(require 'ediff-util)
 
 (defcustom ediff-patch-program  "patch"
   "Name of the program that applies patches.
@@ -472,6 +468,8 @@
         (set-window-buffer ediff-window-B ediff-patch-diagnostics))
        (t (display-buffer ediff-patch-diagnostics 'not-this-window))))
 
+(defvar ediff-use-last-dir)
+
 ;; prompt for file, get the buffer
 (defun ediff-prompt-for-patch-file ()
   (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch)
@@ -642,6 +640,11 @@
 ;;;      (eq code 0)
 ;;;    (not (eq code 2))))
 
+(autoload 'ediff-find-file "ediff")
+(declare-function ediff-buffers-internal "ediff"
+                 (buf-a buf-b buf-c startup-hooks job-name
+                        &optional merge-buffer-file))
+
 (defun ediff-patch-file-internal (patch-buf source-filename
                                            &optional startup-hooks)
   (setq source-filename (expand-file-name source-filename))

=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el     2013-02-23 21:54:00 +0000
+++ b/lisp/vc/ediff-util.el     2013-05-23 07:10:05 +0000
@@ -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 @@
   (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.

=== modified file 'lisp/vc/ediff-wind.el'
--- a/lisp/vc/ediff-wind.el     2013-01-01 09:11:05 +0000
+++ b/lisp/vc/ediff-wind.el     2013-05-23 07:10:05 +0000
@@ -42,17 +42,16 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
-(eval-when-compile
-  (require 'ediff-util)
-  (require 'ediff-help))
+(require 'ediff-init)
+(require 'ediff-help)
 ;; end pacifier
 
-(require 'ediff-init)
 
 ;; be careful with ediff-tbar
-(if (featurep 'xemacs)
-    (require 'ediff-tbar)
-  (defun ediff-compute-toolbar-width () 0))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (require 'ediff-tbar)
+    (defun ediff-compute-toolbar-width () 0)))
 
 (defgroup ediff-window nil
   "Ediff window manipulation."
@@ -358,6 +357,8 @@
     (ediff-setup-windows-plain-compare
      buffer-A buffer-B buffer-C control-buffer)))
 
+(autoload 'ediff-setup-control-buffer "ediff-util")
+
 (defun ediff-setup-windows-plain-merge (buf-A buf-B buf-C control-buffer)
   ;; skip dedicated and unsplittable frames
   (ediff-destroy-control-frame control-buffer)
@@ -908,6 +909,8 @@
     (not (ediff-frame-has-dedicated-windows (window-frame wind)))
     )))
 
+(declare-function ediff-make-bottom-toolbar "ediff-util" (&optional frame))
+
 ;; Prepare or refresh control frame
 (defun ediff-setup-control-frame (ctl-buffer designated-minibuffer-frame)
   (let ((window-min-height 1)

=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el  2013-05-22 03:17:22 +0000
+++ b/lisp/vc/ediff.el  2013-05-23 07:10:05 +0000
@@ -116,11 +116,7 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 
-
-(eval-when-compile
-  (require 'dired)
-  (require 'ediff-util)
-  (require 'ediff-ptch))
+(require 'ediff-util)
 ;; end pacifier
 
 (require 'ediff-init)
@@ -154,6 +150,11 @@
   (ediff-with-current-buffer ediff-buffer-A
     (setq buffer-read-only t)))
 
+(declare-function dired-get-filename "dired"
+                  (&optional localp no-error-if-not-filep))
+(declare-function dired-get-marked-files "dired"
+                  (&optional localp arg filter distinguish-one-marked))
+
 ;; Return a plausible default for ediff's first file:
 ;; In dired, return the file number FILENO (or 0) in the list
 ;; (all-selected-files, filename under the cursor), where directories are
@@ -1345,6 +1346,12 @@
      rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
 
 ;;; Apply patch
+(defvar ediff-last-dir-patch)
+(defvar ediff-patch-default-directory)
+(declare-function ediff-get-patch-buffer "ediff-ptch"
+                  (&optional arg patch-buf))
+(declare-function ediff-dispatch-file-patching-job "ediff-ptch"
+                  (patch-buf filename &optional startup-hooks))
 
 ;;;###autoload
 (defun ediff-patch-file (&optional arg patch-buf)
@@ -1373,6 +1380,9 @@
           source-dir nil nil (ediff-get-default-file-name)))
     (ediff-dispatch-file-patching-job patch-buf source-file)))
 
+(declare-function ediff-patch-buffer-internal "ediff-ptch"
+                  (patch-buf buf-to-patch-name &optional startup-hooks))
+
 ;;;###autoload
 (defun ediff-patch-buffer (&optional arg patch-buf)
   "Run Ediff by patching the buffer specified at prompt.