Mercurial > emacs
changeset 13216:b9dc8cc658d5
Moved defsubsts up.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sat, 14 Oct 1995 03:14:11 +0000 |
| parents | e0ee1eaaabc5 |
| children | c3f879af05db |
| files | lisp/ediff-diff.el lisp/ediff-init.el lisp/ediff-merg.el lisp/ediff-mult.el lisp/ediff-util.el |
| diffstat | 5 files changed, 14 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Sat Oct 14 03:12:53 1995 +0000 +++ b/lisp/ediff-diff.el Sat Oct 14 03:14:11 1995 +0000 @@ -491,10 +491,6 @@ (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.
--- a/lisp/ediff-init.el Sat Oct 14 03:12:53 1995 +0000 +++ b/lisp/ediff-init.el Sat Oct 14 03:14:11 1995 +0000 @@ -1421,6 +1421,10 @@ (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)
--- 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)
--- a/lisp/ediff-mult.el Sat Oct 14 03:12:53 1995 +0000 +++ b/lisp/ediff-mult.el Sat Oct 14 03:14:11 1995 +0000 @@ -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.
--- a/lisp/ediff-util.el Sat Oct 14 03:12:53 1995 +0000 +++ b/lisp/ediff-util.el Sat Oct 14 03:14:11 1995 +0000 @@ -61,14 +61,6 @@ (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)