aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff-diff.el
diff options
context:
space:
mode:
authorGlenn Morris2007-08-08 07:40:09 +0000
committerGlenn Morris2007-08-08 07:40:09 +0000
commit4837b516ea56c6cc2b3ce823b04078b10b2defc6 (patch)
tree8d2cf5aab413be0a169520329f869601e2fed0bf /lisp/ediff-diff.el
parent5453fa41122e3278a442f4fab855561e41f4034f (diff)
downloademacs-4837b516ea56c6cc2b3ce823b04078b10b2defc6.tar.gz
emacs-4837b516ea56c6cc2b3ce823b04078b10b2defc6.zip
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.")
867 (ediff-make-fine-diffs n 'noforce) 867 (ediff-make-fine-diffs n 'noforce)
868 (ediff-make-fine-diffs n 'skip))) 868 (ediff-make-fine-diffs n 'skip)))
869 869
870 ;; highlight iff fine diffs already exist 870 ;; highlight if fine diffs already exist
871 ((eq ediff-auto-refine 'off) 871 ((eq ediff-auto-refine 'off)
872 (ediff-make-fine-diffs n 'skip)))) 872 (ediff-make-fine-diffs n 'skip))))
873 873
@@ -1459,7 +1459,7 @@ arguments to `skip-chars-forward'."
1459 1459
1460 1460
1461(defun ediff-same-contents (d1 d2 &optional filter-re) 1461(defun ediff-same-contents (d1 d2 &optional filter-re)
1462 "Returns t iff D1 and D2 have the same content. 1462 "Return t if D1 and D2 have the same content.
1463D1 and D2 can either be both directories or both regular files. 1463D1 and D2 can either be both directories or both regular files.
1464Symlinks and the likes are not handled. 1464Symlinks and the likes are not handled.
1465If FILTER-RE is non-nil, recursive checking in directories 1465If FILTER-RE is non-nil, recursive checking in directories