From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#1183: 23.0.60; ediff-buffers is broken Date: Sat, 18 Oct 2008 11:07:34 +0200 Message-ID: References: <00a101c92fbf$998d19b0$c2b22382@us.oracle.com> <00eb01c92fd0$1be49cc0$c2b22382@us.oracle.com> <002501c93078$21bf8c60$0200a8c0@us.oracle.com> <20081017130533.3c3070bc@kiferserv> <002a01c9307c$3af9fef0$0200a8c0@us.oracle.com> <004901c93087$2c0345e0$0200a8c0@us.oracle.com> <20081017231731.28a0382f@kiferserv> Reply-To: Eli Zaretskii , 1183@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1224322237 19183 80.91.229.12 (18 Oct 2008 09:30:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 18 Oct 2008 09:30:37 +0000 (UTC) Cc: 1183@emacsbugs.donarmstrong.com, bug-gnu-emacs@gnu.org, kifer@cs.stonybrook.edu To: kifer@cs.sunysb.edu, handa@m17n.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 18 11:31:36 2008 connect(): Connection refused Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kr89n-0003VT-7l for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Oct 2008 11:31:36 +0200 Original-Received: from localhost ([127.0.0.1]:34169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kr88e-0007rX-DK for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Oct 2008 05:30:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kr88Y-0007ps-JR for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:30:18 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kr88V-0007mJ-9R for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:30:17 -0400 Original-Received: from [199.232.76.173] (port=55095 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kr88V-0007m3-5A for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:30:15 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:36397) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kr88V-0004Jg-4t for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:30:15 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9I9U0d0016556; Sat, 18 Oct 2008 02:30:01 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m9I9F25a013076; Sat, 18 Oct 2008 02:15:02 -0700 X-Loop: don@donarmstrong.com Resent-From: Eli Zaretskii Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sat, 18 Oct 2008 09:15:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1183 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.122432087111833 (code B ref -1); Sat, 18 Oct 2008 09:15:02 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 18 Oct 2008 09:07:51 +0000 Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9I97jIn011827 for ; Sat, 18 Oct 2008 02:07:47 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kr7mi-0001Fq-0r for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:07:44 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kr7mg-0001FQ-5V for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:07:43 -0400 Original-Received: from [199.232.76.173] (port=60424 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kr7mg-0001FN-14 for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:07:42 -0400 Original-Received: from mtaout4.012.net.il ([84.95.2.10]:31482) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kr7mf-0001nq-Vh for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 05:07:42 -0400 Original-Received: from HOME-C4E4A596F7 ([77.126.98.197]) by i_mtaout4.012.net.il (HyperSendmail v2004.12) with ESMTPA id <0K8X001B3G2YTNV0@i_mtaout4.012.net.il> for bug-gnu-emacs@gnu.org; Sat, 18 Oct 2008 11:08:59 +0200 (IST) In-reply-to: <20081017231731.28a0382f@kiferserv> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 9.1 X-CrossAssassin-Score: 2 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Sat, 18 Oct 2008 05:30:17 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:21652 Archived-At: > Date: Fri, 17 Oct 2008 23:17:31 -0400 > From: Michael Kifer > Cc: "'Eli Zaretskii'" , , > <1183@emacsbugs.donarmstrong.com>, , > > > Ediff-buffers does almost the right thing (at least, was doing until things > changed in emacs). It would save the buffers in temp files using the *same* > encoding, so all that crap is pushed out of the way. Then it would run diff on > the temp files. Since the encodings are the same, diff would find what is > different and then ediff will display that. (With all its complexity, ediff is > just a front-end for diff.) So, for ediff-buffers, the question is which > encoding to use. The right encoding in Emacs 23 is utf-8-emacs-unix. The problem with that is that ediff-exec-process then uses raw-text to read the output from Diff back into Emacs. While raw-text is probably OK for reading Diff output from comparing _files_, I'm afraid it will not be TRT for reading output from comparing 2 temporary files encoded in utf-8-emacs-unix. If my fears are justified, I guess we will have to modify ediff-exec-process so as to use utf-8-emacs-unix when ediff-job-name has "buffers" in it. > For ediff-files things seem to be worse: it runs diff on the original files, so > if one has DOS line endings and the other does not then it all depends on what > diff does. This is why sometimes you run ediff files on 2 files that are > nearly identical and get one big diff region equal to the entire file. > This is a bit annoying, but not too bad, since hitting * should fix the > problem: it would save the diff regions using the same encoding and will run > diff over them. Yes, but will hitting "*" help for Drew's use-case? AFAIU, it will "magically" show only the textual diffs, with no real explanation how come the original display shows that every line is different, is that right? (Btw, "M-x ediff" actually does not pass the --binary switch to Diff, so the original Ediff display is actually what Drew wanted, but let's say we are doing the same on Unix, where changes in the EOL format are reported by Diff as differences by default.) > Back then Stefan suggested emacs-mule instead of no-conversion, but for some > reason this was not done--don't remember why. No special reason. > He also said that things will change in emacs 23, but I did not > follow that development. See above. I see that Stefan introduced emacs-internal into the Emacs 22 branch, but I don't see it on the trunk yet. If and when it arrives, we should use that one instead.