Mailing-List: contact cygwin-help@sourceware.cygnus.com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@sources.redhat.com Delivered-To: mailing list cygwin@sources.redhat.com From: Chuck.Irvine@mail.sprint.com X-OpenMail-Hops: 1 Date: Fri, 19 Jan 2001 16:51:06 -0600 Message-Id: Subject: ^M diff related problem MIME-Version: 1.0 TO: cygwin@sourceware.cygnus.com CC: C.Conrad@cli.de, christoph.conrad@gmx.de, kifer@cs.sunysb.edu Content-Type: multipart/mixed; boundary="openmail-part-1dadf399-00000001" --openmail-part-1dadf399-00000001 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline ;Creation-Date="Fri, 19 Jan 2001 16:51:06 -0600" Content-Transfer-Encoding: 7bit When invoking diff in a bash shell, output gets generated with ^M terminated lines. This seems to cause certain diff dependent emacs commands, e.g. vc-resolve-conflicts, to misbehave. To illustrate: *********************************************** > echo hello >> test > echo hello >> test2 > echo hello >> test2 > diff -C 2 test test2 | cat -v - *** test Fri Jan 19 16:52:24 2001^M --- test2 Fri Jan 19 16:52:44 2001^M ***************^M *** 1 ****^M --- 1,2 ----^M hello^M + hello^M > echo $CYGWIN binmode ************************************************ I've done some reading regarding binary vs text mode and the only relevant config setting I can find is setting CYGWIN to binary, which I've done, as shown above. After doing so, I still get the error above. Any help with getting rid of these ^M would be greatly appreciated. Chuck Sprint --openmail-part-1dadf399-00000001 Content-Type: text/plain; charset=us-ascii -- Want to unsubscribe from this list? Check out: http://cygwin.com/ml/#unsubscribe-simple --openmail-part-1dadf399-00000001--