diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-06-22 03:20:38 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-06-22 03:20:38 +0000 |
| commit | 52fa07baf5f65466a351cac223f37163ab45123e (patch) | |
| tree | 7193ff67d2561ead008fbabac2f2814cd5503178 /lisp/ediff-diff.el | |
| parent | 16bba9cabc8c047c830698a1d6f0b367e5516945 (diff) | |
| download | emacs-52fa07baf5f65466a351cac223f37163ab45123e.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 82e260f249d..8f714318f15 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -137,9 +137,8 @@ one optional arguments, diff-number to refine.") (ediff-extract-diffs ediff-diff-buffer ediff-word-mode ediff-narrow-bounds))) -;; fill in DIFF-BUFFER with the output from the diff program run on FILE1 and -;; FILE2 -;; Return the length of that buffer. +;; Run the diff program on FILE1 and FILE2 and put the output in DIFF-BUFFER +;; Return the size of DIFF-BUFFER (defun ediff-make-diff2-buffer (diff-buffer file1 file2) (cond ((< (ediff-file-size file1) 0) (message "Can't diff remote files: %s" |