Mercurial > emacs
diff lisp/ediff-diff.el @ 82365:e5a68f18fcb9
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 13 Aug 2007 13:41:28 +0000 |
| parents | 7c8949dbfa0d |
| children | 73661ddc7ac7 a2b33caadccd 424b655804ca |
line wrap: on
line diff
--- a/lisp/ediff-diff.el Mon Aug 13 11:27:41 2007 +0000 +++ b/lisp/ediff-diff.el Mon Aug 13 13:41:28 2007 +0000 @@ -867,7 +867,7 @@ (ediff-make-fine-diffs n 'noforce) (ediff-make-fine-diffs n 'skip))) - ;; highlight iff fine diffs already exist + ;; highlight if fine diffs already exist ((eq ediff-auto-refine 'off) (ediff-make-fine-diffs n 'skip)))) @@ -1459,7 +1459,7 @@ (defun ediff-same-contents (d1 d2 &optional filter-re) - "Returns t iff D1 and D2 have the same content. + "Return t if D1 and D2 have the same content. D1 and D2 can either be both directories or both regular files. Symlinks and the likes are not handled. If FILTER-RE is non-nil, recursive checking in directories