From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#45016: 26.3; when in ediff-current-file, 'D' (view diff) shows empty diff Date: Sun, 24 Jan 2021 00:27:19 +0100 Message-ID: <87im7nqlns.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24471"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 45016@debbugs.gnu.org To: Guilhem Bichot Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jan 24 00:28:09 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l3SK8-0006EP-Sj for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Jan 2021 00:28:08 +0100 Original-Received: from localhost ([::1]:32812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3SK7-0002hz-Re for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 23 Jan 2021 18:28:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3SK2-0002hr-5j for bug-gnu-emacs@gnu.org; Sat, 23 Jan 2021 18:28:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3SK1-0001eE-V1 for bug-gnu-emacs@gnu.org; Sat, 23 Jan 2021 18:28:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3SK1-0006qL-Q4 for bug-gnu-emacs@gnu.org; Sat, 23 Jan 2021 18:28:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Jan 2021 23:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45016 X-GNU-PR-Package: emacs Original-Received: via spool by 45016-submit@debbugs.gnu.org id=B45016.161144445426271 (code B ref 45016); Sat, 23 Jan 2021 23:28:01 +0000 Original-Received: (at 45016) by debbugs.gnu.org; 23 Jan 2021 23:27:34 +0000 Original-Received: from localhost ([127.0.0.1]:35608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3SJa-0006pf-8E for submit@debbugs.gnu.org; Sat, 23 Jan 2021 18:27:34 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:57160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3SJY-0006pP-C5 for 45016@debbugs.gnu.org; Sat, 23 Jan 2021 18:27:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=SU0Au7lWlysUFWg6sK3frq5zer2jrtuyhxwf8r7reco=; b=WlsiUjdYxnkPYdmB+yvEqhZgwd /p8NycZNB/eWT7O60BYp2VyyEQofHYMTzSc/sC/OHYN7lCf1XEePg9XjaowHAqNWORwB+ih0+KbwN LKP0MePdkSB0/nTtSobeichNh5Gh94yLsdyAd+yRebDlUHH4npMzgP1F5TEds40Y5uWc=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l3SJM-0006iJ-VC; Sun, 24 Jan 2021 00:27:26 +0100 X-Now-Playing: Mourning A BLKstar's _The Cycle_: "Sense Of An Ending" In-Reply-To: (Guilhem Bichot's message of "Wed, 2 Dec 2020 21:52:56 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198485 Archived-At: Guilhem Bichot writes: > * start emacs -Q > * create a file named, for example, /tmp/a > * put a line of text in it, save it > * add some characters to this line, don't save > * launch M-x ediff-current-file > * press D to view the diff > * a buffer opens to show the diff but it is empty. I expected to see a > non-empty diff (a context diff, as ediff-custom-diff-options is at its > default "-c"). > * if instead of D I press C-u D then I do get a non-empty plain diff > (non-context, non-unified). This bug is still present in Emacs 28. This is how the `D' command starts: (defun ediff-show-diff-output (arg) (interactive "P") [...] (let ((buf (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer)) ediff-diff-buffer) ((ediff-buffer-live-p ediff-custom-diff-buffer) ediff-custom-diff-buffer) There's helpfully no doc string here (or comments) about what `arg' is meant to express, but if we have `arg', we work on `ediff-diff-buffer' (and this works), and if we don't have `arg', then `ediff-custom-diff-buffer' is used (and this doesn't work). I'm pretty unfamiliar with ediff -- does anybody know what the intention here is for the prefix arg? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no