From unknown Sat Aug 09 05:05:23 2025 X-Loop: help-debbugs@gnu.org Subject: bug#29138: ediff-wind doc "are is" Resent-From: Shuguang Sun Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Nov 2017 16:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 29138 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 29138@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.150972825924001 (code B ref -1); Fri, 03 Nov 2017 16:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Nov 2017 16:57:39 +0000 Received: from localhost ([127.0.0.1]:49781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAfHm-0006F3-LR for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAfHl-0006Eq-Am for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAfHf-00034M-CV for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAfHf-00034A-7l for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAfHd-0006oi-Jy for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAfHc-0002xB-L7 for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:29 -0400 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]:50937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAfHc-0002uE-Ce for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:28 -0400 Received: by mail-qk0-x22c.google.com with SMTP id o187so3974881qke.7 for ; Fri, 03 Nov 2017 09:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=9xpWijvE451kIbRqvxeYtW0oYSnmooikyl582HYwAaY=; b=TJvmo0ufJL71kRkLfSWiUc6+5Ek5ZcDTQ7bHhuh4C4UrUtIEXeEDxbjeBMSjDVfbQZ Pe88A1aFQ0yVM/ccOG6D6cI9nGR1ElQ5IKC8sJMu7E+bwMC6guRG9alPfblJvexn451f WS16jVm7z27uCReWeUmII822s3cTN4+fNsz1XtBZyym24sCOQZbLSi3W2I8qA46VkMnK Ac40jmTWewXxR7Qg5bhh+9p4zUS2bTQnaJ+F36vzYF6X8RRMQG2CuC6p0oE4QOX3CGJC y+AUKQgRiPTJmMmy/M9v7DWeqg4M6pTqnAxNXxILqJWftFgRsaob4REjQoj2xE9+D7Jd AsNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=9xpWijvE451kIbRqvxeYtW0oYSnmooikyl582HYwAaY=; b=juMn8Eqj3ZjY7AaIsZyAOiPcKN4ub0fA7HSrB5W8oxdiTuVa90ipcbVYkthJ8urhu/ XB6fdyjtt5QlzNsT0dZg7fHc5hkCFwaSQuMKduppBSbS2O6fQVXaRv5ccEMIiXhxGNnx nlH795j2iVJ1PxuxTgwAwbha0Z/ifgpYVpnCYTuVWr2DLosTIPACyQtCrOHoH0R0fTg1 S3kTNTw3qyFHq/xpie1eZyg5nBYHi3Oy+FFasKgvoKFSknjZXIpx2/rXsqT3Lw+ViNLj P3903y3YP1zaQtStfId9/OhbPprXe8XOBwx2dyd8ZtjFPQix2FlLluUEhblD2cKwaKtp +Yvg== X-Gm-Message-State: AJaThX4f2kGP2PI8nO8Q+25u3zbjou/gTrRektcRVuhYlwc/1sWW/EZ9 gbfE4fZFmUhNf9sXXCx3b1TD6qAUf9s8xR549u9KDQ== X-Google-Smtp-Source: ABhQp+RbLrYxBHlT8jQjlNFbXWDD6VLJ0ntxgw2Kq0py0dznvklf4czI8s6us8OP3iyEOHdybwApH418MJ7v/qsWRE8= X-Received: by 10.55.23.101 with SMTP id i98mr10279066qkh.193.1509728247116; Fri, 03 Nov 2017 09:57:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.52.37 with HTTP; Fri, 3 Nov 2017 09:57:26 -0700 (PDT) From: Shuguang Sun Date: Sat, 4 Nov 2017 00:57:26 +0800 Message-ID: Content-Type: multipart/mixed; boundary="001a113e9164e099b9055d16ff9f" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --001a113e9164e099b9055d16ff9f Content-Type: multipart/alternative; boundary="001a113e9164e099b6055d16ff9d" --001a113e9164e099b6055d16ff9d Content-Type: text/plain; charset="UTF-8" Hi, In the document of ediff-setup-windows-multiframe-merge in ediff-wind.el, it used "are is" which I think it should be "are". index ce95d42..79ccc6d 100644 --- "b/c:\\Users\\gitemacs\\emacs\\lisp\\vc\\ediff-wind.el" +++ "a/c:\\Users\\Desktop\\ediff-wind.el" @@ -523,7 +523,7 @@ into icons, regardless of the window manager." ;; 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 + ;; 4. If buffers A, B, C are separate frames, use them to display these ;; buffers. ;; Skip dedicated or iconified frames. --001a113e9164e099b6055d16ff9d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

In the document of ediff= -setup-windows-multiframe-merge in ediff-wind.el, it used "are is"= ; which I think it should be "are".


=
index ce95d42..79ccc6d 100644
--- "b/c:\\Users\\gitemacs= \\emacs\\lisp\\vc\\ediff-wind.el"
+++ "a/c:\\Users\\Desktop\\e= diff-wind.el"
@@ -523,7 +523,7 @@ into icons, regardless of the win= dow manager."
=C2=A0=C2=A0 ;;=C2=A0=C2=A0 3. If C's frame is no= n-existent, then: if the first suitable
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 non-dedicated frame=C2=A0 is different from A&B's, = then use it for C.
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Otherwi= se, put A,B, and C in one frame.
-=C2=A0 ;;=C2=A0=C2=A0 4. If buffers A,= B, C are is separate frames, use them to display these
+=C2=A0 ;;=C2=A0= =C2=A0 4. If buffers A, B, C are separate frames, use them to display these=
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 buffers.
=C2=A0
=C2= =A0=C2=A0 ;;=C2=A0=C2=A0 Skip dedicated or iconified frames.

<= /div> --001a113e9164e099b6055d16ff9d-- --001a113e9164e099b9055d16ff9f Content-Type: text/plain; charset="US-ASCII"; name="ediff-wind.diff" Content-Disposition: attachment; filename="ediff-wind.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j9k57f950 aW5kZXggY2U5NWQ0Mi4uNzljY2M2ZCAxMDA2NDQKLS0tICJiL2M6XFxVc2Vyc1xcZ2l0ZW1hY3Nc XGVtYWNzXFxsaXNwXFx2Y1xcZWRpZmYtd2luZC5lbCIKKysrICJhL2M6XFxVc2Vyc1xcRGVza3Rv cFxcZWRpZmYtd2luZC5lbCIKQEAgLTUyMyw3ICs1MjMsNyBAQCBpbnRvIGljb25zLCByZWdhcmRs ZXNzIG9mIHRoZSB3aW5kb3cgbWFuYWdlci4iCiAgIDs7ICAgMy4gSWYgQydzIGZyYW1lIGlzIG5v bi1leGlzdGVudCwgdGhlbjogaWYgdGhlIGZpcnN0IHN1aXRhYmxlCiAgIDs7ICAgICAgbm9uLWRl ZGljYXRlZCBmcmFtZSAgaXMgZGlmZmVyZW50IGZyb20gQSZCJ3MsIHRoZW4gdXNlIGl0IGZvciBD LgogICA7OyAgICAgIE90aGVyd2lzZSwgcHV0IEEsQiwgYW5kIEMgaW4gb25lIGZyYW1lLgotICA7 OyAgIDQuIElmIGJ1ZmZlcnMgQSwgQiwgQyBhcmUgaXMgc2VwYXJhdGUgZnJhbWVzLCB1c2UgdGhl bSB0byBkaXNwbGF5IHRoZXNlCisgIDs7ICAgNC4gSWYgYnVmZmVycyBBLCBCLCBDIGFyZSBzZXBh cmF0ZSBmcmFtZXMsIHVzZSB0aGVtIHRvIGRpc3BsYXkgdGhlc2UKICAgOzsgICAgICBidWZmZXJz LgogCiAgIDs7ICAgU2tpcCBkZWRpY2F0ZWQgb3IgaWNvbmlmaWVkIGZyYW1lcy4K --001a113e9164e099b9055d16ff9f-- From unknown Sat Aug 09 05:05:23 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Shuguang Sun Subject: bug#29138: closed (Re: bug#29138: ediff-wind doc "are is") Message-ID: References: <83h8ubuqdg.fsf@gnu.org> X-Gnu-PR-Message: they-closed 29138 X-Gnu-PR-Package: emacs Reply-To: 29138@debbugs.gnu.org Date: Fri, 03 Nov 2017 19:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1509736502-4087-1" This is a multi-part message in MIME format... ------------=_1509736502-4087-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #29138: ediff-wind doc "are is" which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 29138@debbugs.gnu.org. --=20 29138: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D29138 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1509736502-4087-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 29138-done) by debbugs.gnu.org; 3 Nov 2017 19:14:16 +0000 Received: from localhost ([127.0.0.1]:49841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAhPz-00012m-Pb for submit@debbugs.gnu.org; Fri, 03 Nov 2017 15:14:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAhPx-00012Z-VU for 29138-done@debbugs.gnu.org; Fri, 03 Nov 2017 15:14:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAhPp-0003ZF-Mo for 29138-done@debbugs.gnu.org; Fri, 03 Nov 2017 15:14:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAhPp-0003Ym-KD; Fri, 03 Nov 2017 15:14:05 -0400 Received: from [176.228.60.248] (port=2394 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eAhPp-0004Xm-0t; Fri, 03 Nov 2017 15:14:05 -0400 Date: Fri, 03 Nov 2017 21:14:03 +0200 Message-Id: <83h8ubuqdg.fsf@gnu.org> From: Eli Zaretskii To: Shuguang Sun In-reply-to: (message from Shuguang Sun on Sat, 4 Nov 2017 00:57:26 +0800) Subject: Re: bug#29138: ediff-wind doc "are is" References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 29138-done Cc: 29138-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: Shuguang Sun > Date: Sat, 4 Nov 2017 00:57:26 +0800 > > In the document of ediff-setup-windows-multiframe-merge in ediff-wind.el, it used "are is" which I think it > should be "are". It should be "are in". Thanks, I fixed this and some other typos in that commentary. ------------=_1509736502-4087-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Nov 2017 16:57:39 +0000 Received: from localhost ([127.0.0.1]:49781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAfHm-0006F3-LR for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eAfHl-0006Eq-Am for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAfHf-00034M-CV for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAfHf-00034A-7l for submit@debbugs.gnu.org; Fri, 03 Nov 2017 12:57:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAfHd-0006oi-Jy for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAfHc-0002xB-L7 for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:29 -0400 Received: from mail-qk0-x22c.google.com ([2607:f8b0:400d:c09::22c]:50937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAfHc-0002uE-Ce for bug-gnu-emacs@gnu.org; Fri, 03 Nov 2017 12:57:28 -0400 Received: by mail-qk0-x22c.google.com with SMTP id o187so3974881qke.7 for ; Fri, 03 Nov 2017 09:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=9xpWijvE451kIbRqvxeYtW0oYSnmooikyl582HYwAaY=; b=TJvmo0ufJL71kRkLfSWiUc6+5Ek5ZcDTQ7bHhuh4C4UrUtIEXeEDxbjeBMSjDVfbQZ Pe88A1aFQ0yVM/ccOG6D6cI9nGR1ElQ5IKC8sJMu7E+bwMC6guRG9alPfblJvexn451f WS16jVm7z27uCReWeUmII822s3cTN4+fNsz1XtBZyym24sCOQZbLSi3W2I8qA46VkMnK Ac40jmTWewXxR7Qg5bhh+9p4zUS2bTQnaJ+F36vzYF6X8RRMQG2CuC6p0oE4QOX3CGJC y+AUKQgRiPTJmMmy/M9v7DWeqg4M6pTqnAxNXxILqJWftFgRsaob4REjQoj2xE9+D7Jd AsNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=9xpWijvE451kIbRqvxeYtW0oYSnmooikyl582HYwAaY=; b=juMn8Eqj3ZjY7AaIsZyAOiPcKN4ub0fA7HSrB5W8oxdiTuVa90ipcbVYkthJ8urhu/ XB6fdyjtt5QlzNsT0dZg7fHc5hkCFwaSQuMKduppBSbS2O6fQVXaRv5ccEMIiXhxGNnx nlH795j2iVJ1PxuxTgwAwbha0Z/ifgpYVpnCYTuVWr2DLosTIPACyQtCrOHoH0R0fTg1 S3kTNTw3qyFHq/xpie1eZyg5nBYHi3Oy+FFasKgvoKFSknjZXIpx2/rXsqT3Lw+ViNLj P3903y3YP1zaQtStfId9/OhbPprXe8XOBwx2dyd8ZtjFPQix2FlLluUEhblD2cKwaKtp +Yvg== X-Gm-Message-State: AJaThX4f2kGP2PI8nO8Q+25u3zbjou/gTrRektcRVuhYlwc/1sWW/EZ9 gbfE4fZFmUhNf9sXXCx3b1TD6qAUf9s8xR549u9KDQ== X-Google-Smtp-Source: ABhQp+RbLrYxBHlT8jQjlNFbXWDD6VLJ0ntxgw2Kq0py0dznvklf4czI8s6us8OP3iyEOHdybwApH418MJ7v/qsWRE8= X-Received: by 10.55.23.101 with SMTP id i98mr10279066qkh.193.1509728247116; Fri, 03 Nov 2017 09:57:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.52.37 with HTTP; Fri, 3 Nov 2017 09:57:26 -0700 (PDT) From: Shuguang Sun Date: Sat, 4 Nov 2017 00:57:26 +0800 Message-ID: Subject: ediff-wind doc "are is" To: bug-gnu-emacs@gnu.org Content-Type: multipart/mixed; boundary="001a113e9164e099b9055d16ff9f" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --001a113e9164e099b9055d16ff9f Content-Type: multipart/alternative; boundary="001a113e9164e099b6055d16ff9d" --001a113e9164e099b6055d16ff9d Content-Type: text/plain; charset="UTF-8" Hi, In the document of ediff-setup-windows-multiframe-merge in ediff-wind.el, it used "are is" which I think it should be "are". index ce95d42..79ccc6d 100644 --- "b/c:\\Users\\gitemacs\\emacs\\lisp\\vc\\ediff-wind.el" +++ "a/c:\\Users\\Desktop\\ediff-wind.el" @@ -523,7 +523,7 @@ into icons, regardless of the window manager." ;; 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 + ;; 4. If buffers A, B, C are separate frames, use them to display these ;; buffers. ;; Skip dedicated or iconified frames. --001a113e9164e099b6055d16ff9d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

In the document of ediff= -setup-windows-multiframe-merge in ediff-wind.el, it used "are is"= ; which I think it should be "are".


=
index ce95d42..79ccc6d 100644
--- "b/c:\\Users\\gitemacs= \\emacs\\lisp\\vc\\ediff-wind.el"
+++ "a/c:\\Users\\Desktop\\e= diff-wind.el"
@@ -523,7 +523,7 @@ into icons, regardless of the win= dow manager."
=C2=A0=C2=A0 ;;=C2=A0=C2=A0 3. If C's frame is no= n-existent, then: if the first suitable
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 non-dedicated frame=C2=A0 is different from A&B's, = then use it for C.
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Otherwi= se, put A,B, and C in one frame.
-=C2=A0 ;;=C2=A0=C2=A0 4. If buffers A,= B, C are is separate frames, use them to display these
+=C2=A0 ;;=C2=A0= =C2=A0 4. If buffers A, B, C are separate frames, use them to display these=
=C2=A0=C2=A0 ;;=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 buffers.
=C2=A0
=C2= =A0=C2=A0 ;;=C2=A0=C2=A0 Skip dedicated or iconified frames.

<= /div> --001a113e9164e099b6055d16ff9d-- --001a113e9164e099b9055d16ff9f Content-Type: text/plain; charset="US-ASCII"; name="ediff-wind.diff" Content-Disposition: attachment; filename="ediff-wind.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j9k57f950 aW5kZXggY2U5NWQ0Mi4uNzljY2M2ZCAxMDA2NDQKLS0tICJiL2M6XFxVc2Vyc1xcZ2l0ZW1hY3Nc XGVtYWNzXFxsaXNwXFx2Y1xcZWRpZmYtd2luZC5lbCIKKysrICJhL2M6XFxVc2Vyc1xcRGVza3Rv cFxcZWRpZmYtd2luZC5lbCIKQEAgLTUyMyw3ICs1MjMsNyBAQCBpbnRvIGljb25zLCByZWdhcmRs ZXNzIG9mIHRoZSB3aW5kb3cgbWFuYWdlci4iCiAgIDs7ICAgMy4gSWYgQydzIGZyYW1lIGlzIG5v bi1leGlzdGVudCwgdGhlbjogaWYgdGhlIGZpcnN0IHN1aXRhYmxlCiAgIDs7ICAgICAgbm9uLWRl ZGljYXRlZCBmcmFtZSAgaXMgZGlmZmVyZW50IGZyb20gQSZCJ3MsIHRoZW4gdXNlIGl0IGZvciBD LgogICA7OyAgICAgIE90aGVyd2lzZSwgcHV0IEEsQiwgYW5kIEMgaW4gb25lIGZyYW1lLgotICA7 OyAgIDQuIElmIGJ1ZmZlcnMgQSwgQiwgQyBhcmUgaXMgc2VwYXJhdGUgZnJhbWVzLCB1c2UgdGhl bSB0byBkaXNwbGF5IHRoZXNlCisgIDs7ICAgNC4gSWYgYnVmZmVycyBBLCBCLCBDIGFyZSBzZXBh cmF0ZSBmcmFtZXMsIHVzZSB0aGVtIHRvIGRpc3BsYXkgdGhlc2UKICAgOzsgICAgICBidWZmZXJz LgogCiAgIDs7ICAgU2tpcCBkZWRpY2F0ZWQgb3IgaWNvbmlmaWVkIGZyYW1lcy4K --001a113e9164e099b9055d16ff9f-- ------------=_1509736502-4087-1--