[Emacs-diffs] Changes to emacs/lisp/ediff-diff.el, v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/08/08 07:38:50

Index: ediff-diff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-diff.el,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.2
diff -u -b -r1.58.2.1 -r1.58.2.2
--- ediff-diff.el       25 Jul 2007 04:47:28 -0000      1.58.2.1
+++ ediff-diff.el       8 Aug 2007 07:38:48 -0000       1.58.2.2
@@ -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