Moved defsubsts up.

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index b326d68ed5c28cd210af72c11e61ae21c65e223d..20a0d9f5ef7da84a5fea49b4cca4444ccd107dc5 100644 (file)
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -491,10 +491,6 @@ one optional arguments, diff-number to refine.")
         (vconcat diff-overlay-list))
     ))
 
-(defsubst ediff-message-if-verbose (string &rest args)
-  (if ediff-verbose-p
-      (apply 'message string args)))
-        
 ;; `n' is the diff region to work on.  Default is ediff-current-difference.
 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
 ;; diffs have not been computed before.

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 2e2079c50032c72cb506df02839aa32cf389414d..3be041ddbc227e9705de47d094ec41f0a008bc21 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1421,6 +1421,10 @@ More precisely, a regexp to match any one such character.")
 
 (defsubst Xor (a b)
   (or (and a (not b)) (and (not a) b)))
+
+(defsubst ediff-message-if-verbose (string &rest args)
+  (if ediff-verbose-p
+      (apply 'message string args)))
      
 (provide 'ediff-init)
 

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 3280861efdf263b330d0c7cde718e39d2e1f21f7..ef14c8c436a209404cf8cd42064e68a54bfed5c8 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -50,7 +50,14 @@ skiped over. Nil means show all regions.")
          (nth 1 ediff-combination-pattern) "\n"
          (ediff-get-region-contents n 'B ediff-control-buffer)
          (nth 2 ediff-combination-pattern) "\n"))
-    
+
+(defsubst ediff-make-combined-diff (regA regB)
+  (concat (nth 0 ediff-combination-pattern) "\n"
+         regA
+         (nth 1 ediff-combination-pattern) "\n"
+         regB
+         (nth 2 ediff-combination-pattern) "\n"))
+
 (defsubst ediff-set-state-of-all-diffs-in-all-buffers (ctl-buf)
   (let ((n 0))
     (while (< n ediff-number-of-differences)
@@ -216,13 +223,6 @@ Combining is done using the list in variable `ediff-combination-pattern'."
     (ediff-copy-diff n nil 'C batch-invocation reg-combined))
     (or batch-invocation (ediff-recenter)))
     
-(defsubst ediff-make-combined-diff (regA regB)
-  (concat (nth 0 ediff-combination-pattern) "\n"
-         regA
-         (nth 1 ediff-combination-pattern) "\n"
-         regB
-         (nth 2 ediff-combination-pattern) "\n"))
-
 
 ;; Checks if the region in buff C looks like a combination of the regions
 ;; in buffers A and B. Returns a list (reg-a-beg reg-a-end reg-b-beg reg-b-end)

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index e50e51e5617a3687ff24646103aa6634a790f384..5d22b29df7ad3f8a6ec7d3f879787fe5400eaaac 100644 (file)
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -74,8 +74,8 @@
 ;; which may be in the same or different directories. Or, one may want to
 ;; compare all files of the form {something} to files of the form {something}~.
 ;;
-;; Implementing this require writing an collating function, which would pair up
-;; appropriate files. It will also require a generalization of the functions
+;; Implementing this requires writing an collating function, which should pair
+;; up appropriate files. It will also require a generalization of the functions
 ;; that do the layout of the meta- and differences buffers and of
 ;; ediff-dir-action.
 

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index bf15d5d500a6f92a377af0867b5c7938314703e2..41cdd8ca02a2155f8fe59904170b17e675736b11 100644 (file)
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -61,14 +61,6 @@ Commands:
   (setq mode-name "Ediff")
   (run-hooks 'ediff-mode-hook))
 
-(defun ediff-version ()
-  "Return string describing the version of Ediff.
-When called interactively, displays the version."
-  (interactive)
-  (if (interactive-p)
-      (message (ediff-version))
-    (format "Ediff %s of %s" ediff-version ediff-date)))
-    
     
 (require 'ediff-diff)
 (require 'ediff-merg)