summaryrefslogtreecommitdiff
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-08-08 07:40:09 +0000
committerGlenn Morris <rgm@gnu.org>2007-08-08 07:40:09 +0000
commit4837b516ea56c6cc2b3ce823b04078b10b2defc6 (patch)
tree8d2cf5aab413be0a169520329f869601e2fed0bf /lisp/ediff-diff.el
parent5453fa41122e3278a442f4fab855561e41f4034f (diff)
downloademacs-4837b516ea56c6cc2b3ce823b04078b10b2defc6.tar.gz
Replace `iff' in doc-strings and comments.
Diffstat (limited to 'lisp/ediff-diff.el')
-rw-r--r--lisp/ediff-diff.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 48cd7c79d4e..ec153fde625 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -867,7 +867,7 @@ one optional arguments, diff-number to refine.")
(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 @@ arguments to `skip-chars-forward'."
(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