From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#11067: 24.0.94.1; diff-buffer-with-file Date: Fri, 23 Mar 2012 21:49:50 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1332553881 25560 80.91.229.3 (24 Mar 2012 01:51:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Mar 2012 01:51:21 +0000 (UTC) Cc: Arni Magnusson , 11067@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 24 02:51:20 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SBG8P-0007jn-8c for geb-bug-gnu-emacs@m.gmane.org; Sat, 24 Mar 2012 02:51:13 +0100 Original-Received: from localhost ([::1]:53280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBG8O-0003jf-1Y for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 Mar 2012 21:51:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBG8L-0003ja-39 for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2012 21:51:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBG8J-0004Vp-EW for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2012 21:51:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBG8J-0004Vk-B1 for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2012 21:51:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SBGcE-0006fa-Gn for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2012 22:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Mar 2012 02:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11067 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 11067-submit@debbugs.gnu.org id=B11067.133255566425570 (code B ref 11067); Sat, 24 Mar 2012 02:22:02 +0000 Original-Received: (at 11067) by debbugs.gnu.org; 24 Mar 2012 02:21:04 +0000 Original-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 Original-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" Original-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 Original-Received: by pastel.home (Postfix, from userid 20848) id B82DA59675; Fri, 23 Mar 2012 21:49:50 -0400 (EDT) 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) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:58058 Archived-At: >> 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