From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 3 Nov 2017 19:12:41 +0000 (+0200)
Subject: Fix typos in ediff-wind.el
X-Git-Tag: emacs-26.0.91~393
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b02c2714c3f1835edf15e34c6b4e3be0c5dd8acf;p=emacs.git

Fix typos in ediff-wind.el

* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix typos in commentary.  (Bug#29138)
---

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index e0c3dbe7b54..138cfdd2e70 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -518,12 +518,12 @@ into icons, regardless of the window manager."
 ;;; Algorithm:
 ;;;   1. Never use frames that have dedicated windows in them---it is bad to
 ;;;      destroy dedicated windows.
-;;;   2. If A and B are in the same frame but C's frame is different--- use one
-;;;      frame for A and B and use a separate frame for C.
+;;;   2. If A and B are in the same frame but C's frame is different---use one
+;;;      frame for A and B, and use a separate frame for C.
 ;;;   3. If C's frame is non-existent, then: if the first suitable
-;;;      non-dedicated frame  is different from A&B's, then use it for C.
-;;;      Otherwise, put A,B, and C in one frame.
-;;;   4. If buffers A, B, C are is separate frames, use them to display these
+;;;      non-dedicated frame is different from A&B's, then use it for C.
+;;;      Otherwise, put A, B, and C in one frame.
+;;;   4. If buffers A, B, C are in separate frames, use them to display these
 ;;;      buffers.
 
   ;;   Skip dedicated or iconified frames.