diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1995-10-14 03:14:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1995-10-14 03:14:11 +0000 |
| commit | 009650b3f974b03c62ab32f1d811ec264676a918 (patch) | |
| tree | b29a51d881d8ddb433a9ee8a32915dd2fb689880 /lisp/ediff-merg.el | |
| parent | f9b2678cbcea5ee8e94de3a35ed44efa6ed61612 (diff) | |
| download | emacs-009650b3f974b03c62ab32f1d811ec264676a918.tar.gz | |
Moved defsubsts up.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 3280861efdf..ef14c8c436a 100644 --- 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) |