diff lisp/ediff-merg.el @ 13216:b9dc8cc658d5

Moved defsubsts up.

--- a/lisp/ediff-merg.el	Sat Oct 14 03:12:53 1995 +0000
+++ b/lisp/ediff-merg.el	Sat Oct 14 03:14:11 1995 +0000
@@ -50,7 +50,14 @@
 	  (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 @@
     (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)