Commit 009650b3 authored by Michael Kifer's avatar Michael Kifer
Browse files

Moved defsubsts up.

parent f9b2678c
......@@ -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.
......
......@@ -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)
......
......@@ -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)
......
......@@ -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.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment