From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 22 11:25:36 2012 Received: (at submit) by debbugs.gnu.org; 22 Mar 2012 15:25:36 +0000 Received: from localhost ([127.0.0.1]:33310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SAjtQ-00012E-5x for submit@debbugs.gnu.org; Thu, 22 Mar 2012 11:25:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59808) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SAjtM-000125-KI for submit@debbugs.gnu.org; Thu, 22 Mar 2012 11:25:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAjPT-0004UJ-3u for submit@debbugs.gnu.org; Thu, 22 Mar 2012 10:54:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:50393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjPT-0004UF-0f for submit@debbugs.gnu.org; Thu, 22 Mar 2012 10:54:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjPM-0003we-Qf for bug-gnu-emacs@gnu.org; Thu, 22 Mar 2012 10:54:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAjPG-0004T5-DR for bug-gnu-emacs@gnu.org; Thu, 22 Mar 2012 10:54:32 -0400 Received: from hafgarpur.hafro.is ([130.208.64.48]:35362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjPG-0004S6-05 for bug-gnu-emacs@gnu.org; Thu, 22 Mar 2012 10:54:26 -0400 X-Virus-Scanned: amavisd-new at hafro.is Received: from hafstokkur.hafro.is (hafstokkur [130.208.66.45]) by hafgarpur.hafro.is (8.14.2/8.14.2/hafro-2.46) with ESMTP id q2MEsGZo004804 for ; Thu, 22 Mar 2012 14:54:16 GMT Received: from hafstokkur.hafro.is (localhost [127.0.0.1]) by hafstokkur.hafro.is (8.14.5/8.14.5/hafro-1.6) with ESMTP id q2MEsG67050672 for ; Thu, 22 Mar 2012 14:54:16 GMT Received: from localhost (arnima@localhost) by hafstokkur.hafro.is (8.14.5/8.14.5/hafro-0.3) with ESMTP id q2MEsG4J050668 for ; Thu, 22 Mar 2012 14:54:16 GMT X-Authentication-Warning: hafstokkur.hafro.is: arnima owned process doing -bs Date: Thu, 22 Mar 2012 14:54:16 +0000 (UTC) From: Arni Magnusson To: bug-gnu-emacs@gnu.org Subject: 24.0.94.1; diff-buffer-with-file Message-ID: User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) I'm running Emacs 24.0.94.1 alpha, http://alpha.gnu.org/gnu/emacs/windows/emacs-20120319-r107630-bin-i386.zip and `diff-buffer-with-file' is not working like it did in Emacs 23.4.1 1. Start emacs -Q 2. Set `diff-command' to "winmerge" and `diff-switches' to nil 3. Open a file, say c:/gnu/emacs/BUGS, make some changes without saving 4. M-x diff-buffer-with-file Emacs 23.4.1 performs this task very nicely, but Emacs 24.0.94.1 alpha provides the external program with args that cannot be compared: c:\gnu\emacs\-L c:\gnu\emacs\BUGS Examining the Emacs *Diff* buffer provides some insights. In Emacs 23.4.1 it contains winmerge "c:/gnu/emacs/BUGS" "c:/Temp/buffer-content-3436L7C" which looks sensible, but in Emacs 24.0.94.1 alpha it the *Diff* buffer contains winmerge "-L" "c:/gnu/emacs/BUGS" "-L" "#" "c:/gnu/emacs/BUGS" "c:/Temp/buffer-content-2640boz" which looks like 6 args instead of 2, including some "-L" options (even after specifically disabling all diff switches) and "#" (probably of no use to an external program). To me, it looks like version 24.0.94.1 of `diff-buffer-with-file' in diff.el should try harder to mimic the behavior of version 23.4.1 in files.el. Many thanks, Arni From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 23 18:05:35 2012 Received: (at 11067) by debbugs.gnu.org; 23 Mar 2012 22:05:35 +0000 Received: from localhost ([127.0.0.1]:35789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCc2-0005p8-Oj for submit@debbugs.gnu.org; Fri, 23 Mar 2012 18:05:35 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36275) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCbU-0005oB-T1 for 11067@debbugs.gnu.org; Fri, 23 Mar 2012 18:05:34 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SBC7Y-00005g-Ut; Fri, 23 Mar 2012 17:34:05 -0400 From: Glenn Morris To: 11067@debbugs.gnu.org Subject: Re: bug#11067: 24.0.94.1; diff-buffer-with-file References: X-Spook: Perl-RSA USCODE cybercash Watergate Janet Reno CID COSCO X-Ran: schK!_$8HOAWJx*\A`@_{yIvUg#iJ (Arni Magnusson's message of "Thu, 22 Mar 2012 14:54:16 +0000 (UTC)") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 11067 Cc: Arni Magnusson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) Arni Magnusson wrote: > in Emacs 24.0.94.1 alpha it the *Diff* buffer contains > > winmerge "-L" "c:/gnu/emacs/BUGS" "-L" "#" > "c:/gnu/emacs/BUGS" "c:/Temp/buffer-content-2640boz" Semi-related: I was wondering why I could not find "-L" in diff's help output or man-page, then I found: http://savannah.nongnu.org/bugs/?35267 Currently CVS uses GNU diff's -L option. That option has been undocumented since diffutils 2.8 (released in March 2002) and the option is intended to be replaced sometime soon with a different meaning. Can you please fix CVS so that it uses "diff --label" instead of "diff -L"? That will make CVS immune to this planned change. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 23 18:10:14 2012 Received: (at 11067) by debbugs.gnu.org; 23 Mar 2012 22:10:14 +0000 Received: from localhost ([127.0.0.1]:35806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCgX-0005wD-LD for submit@debbugs.gnu.org; Fri, 23 Mar 2012 18:10:13 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36329) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCgV-0005w5-IW for 11067@debbugs.gnu.org; Fri, 23 Mar 2012 18:10:12 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SBCCa-0000NS-0s; Fri, 23 Mar 2012 17:39:16 -0400 From: Glenn Morris To: 11067@debbugs.gnu.org Subject: Re: bug#11067: 24.0.94.1; diff-buffer-with-file References: X-Spook: codes Montenegro FIPS140 Lexis-Nexis STARLAN analyzer X-Ran: &OF?fm_UV7X:WW#`hhVdvW*"4at&&G%08}"+7On!hn\+QjYEs^(mL]n?@5#_p,E;t/d:;M X-Hue: cyan X-Debbugs-No-Ack: yes X-Attribution: GM Date: Fri, 23 Mar 2012 17:39:15 -0400 In-Reply-To: (Glenn Morris's message of "Fri, 23 Mar 2012 17:34:04 -0400") Message-ID: <72obrnatfg.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: 11067 Cc: Arni Magnusson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) Also, on "Solaris 10 5/08", /bin/diff does not understand -L (or --label). From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 23 18:12:23 2012 Received: (at control) by debbugs.gnu.org; 23 Mar 2012 22:12:23 +0000 Received: from localhost ([127.0.0.1]:35810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCid-0005zG-7x for submit@debbugs.gnu.org; Fri, 23 Mar 2012 18:12:23 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36349) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBCib-0005z9-3A for control@debbugs.gnu.org; Fri, 23 Mar 2012 18:12:21 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SBCEf-0000Wz-SB for control@debbugs.gnu.org; Fri, 23 Mar 2012 17:41:26 -0400 Date: Fri, 23 Mar 2012 17:41:25 -0400 Message-Id: Subject: control message for bug 11067 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) retitle 11067 diff-no-select assumes diff-command understands -L option From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 23 22:21:04 2012 Received: (at 11067) by debbugs.gnu.org; 24 Mar 2012 02:21:04 +0000 Received: from localhost ([127.0.0.1]:36111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBGbH-0006eM-Uc for submit@debbugs.gnu.org; Fri, 23 Mar 2012 22:21:04 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.183]:42145) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBGb1-0006dd-Hu for 11067@debbugs.gnu.org; Fri, 23 Mar 2012 22:21:02 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9FpYqr/2dsb2JhbACBX5x7eYhwnhmGGQSbGYQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="169791297" Received: from 69-165-138-171.dsl.teksavvy.com (HELO pastel.home) ([69.165.138.171]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 23 Mar 2012 21:49:51 -0400 Received: by pastel.home (Postfix, from userid 20848) id B82DA59675; Fri, 23 Mar 2012 21:49:50 -0400 (EDT) From: Stefan Monnier To: Glenn Morris Subject: Re: bug#11067: 24.0.94.1; diff-buffer-with-file Message-ID: References: Date: Fri, 23 Mar 2012 21:49:50 -0400 In-Reply-To: (Glenn Morris's message of "Fri, 23 Mar 2012 17:34:04 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 11067 Cc: Arni Magnusson , 11067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.4 (-) >> in Emacs 24.0.94.1 alpha it the *Diff* buffer contains >> >> winmerge "-L" "c:/gnu/emacs/BUGS" "-L" "#" >> "c:/gnu/emacs/BUGS" "c:/Temp/buffer-content-2640boz" > Semi-related: > I was wondering why I could not find "-L" in diff's help output or > man-page, then I found: > http://savannah.nongnu.org/bugs/?35267 > Currently CVS uses GNU diff's -L option. That option has been > undocumented since diffutils 2.8 (released in March 2002) and the > option is intended to be replaced sometime soon with a different > meaning. > Can you please fix CVS so that it uses "diff --label" instead of > "diff -L"? That will make CVS immune to this planned change. Hmm... interesting. I found the -L in Debian's Info page and it's still there in Debian's "diffutils-1:3.2-2". So either it's a local addition done by Debian, or the -L is actually documented. ...hmmm... well line 3828 of http://git.savannah.gnu.org/cgit/diffutils.git/tree/doc/diffutils.texi shows that it's documented in diffutils. Stefan From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 23 22:24:56 2012 Received: (at 11067) by debbugs.gnu.org; 24 Mar 2012 02:24:56 +0000 Received: from localhost ([127.0.0.1]:36115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBGf2-0006jf-3C for submit@debbugs.gnu.org; Fri, 23 Mar 2012 22:24:56 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.183]:46800) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SBGez-0006jY-Sy for 11067@debbugs.gnu.org; Fri, 23 Mar 2012 22:24:54 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicFAKU/KE9FpYqr/2dsb2JhbACBX5x7eacJhhkEmFmCQIQJ X-IronPort-AV: E=Sophos;i="4.73,1,1325480400"; d="scan'208";a="169791533" Received: from 69-165-138-171.dsl.teksavvy.com (HELO pastel.home) ([69.165.138.171]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 23 Mar 2012 21:53:57 -0400 Received: by pastel.home (Postfix, from userid 20848) id 6F8A1596F7; Fri, 23 Mar 2012 21:53:57 -0400 (EDT) From: Stefan Monnier To: Arni Magnusson Subject: Re: bug#11067: 24.0.94.1; diff-buffer-with-file Message-ID: References: Date: Fri, 23 Mar 2012 21:53:57 -0400 In-Reply-To: (Arni Magnusson's message of "Thu, 22 Mar 2012 14:54:16 +0000 (UTC)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 11067 Cc: 11067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.9 (-) > http://alpha.gnu.org/gnu/emacs/windows/emacs-20120319-r107630-bin-i386.zip > and `diff-buffer-with-file' is not working like it did in Emacs 23.4.1 > 1. Start emacs -Q > 2. Set `diff-command' to "winmerge" and `diff-switches' to nil It seems that's your problem: winmerge is not a replacement for `diff' because it does not accept the "-L