From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#35624: log-view-diff regression Date: Wed, 08 May 2019 00:56:29 +0300 Organization: LINKOV.NET Message-ID: <87pnou2ak2.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="260055"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) To: 35624@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 08 00:02:15 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hO8A9-0015XN-CP for geb-bug-gnu-emacs@m.gmane.org; Wed, 08 May 2019 00:02:13 +0200 Original-Received: from localhost ([127.0.0.1]:55341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO8A8-0000eM-Da for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 May 2019 18:02:12 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:49462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO8A0-0000e8-A0 for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:02:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO89z-0005Jr-7h for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:02:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hO89y-0005G9-Ro for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:02:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hO89y-0005rC-JZ for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:02:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 May 2019 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35624 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.155726650022480 (code B ref -1); Tue, 07 May 2019 22:02:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 May 2019 22:01:40 +0000 Original-Received: from localhost ([127.0.0.1]:59865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hO89c-0005qW-CY for submit@debbugs.gnu.org; Tue, 07 May 2019 18:01:40 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:34979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hO89a-0005qG-02 for submit@debbugs.gnu.org; Tue, 07 May 2019 18:01:38 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:34908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO89T-0003uG-VQ for submit@debbugs.gnu.org; Tue, 07 May 2019 18:01:32 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:49343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO89S-0000bh-O3 for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:01:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO89R-0003nL-5k for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:01:30 -0400 Original-Received: from common.maple.relay.mailchannels.net ([23.83.214.38]:16616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO89P-0003W4-H1 for bug-gnu-emacs@gnu.org; Tue, 07 May 2019 18:01:29 -0400 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id A378C6A158C for ; Tue, 7 May 2019 22:01:22 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a5.g.dreamhost.com (100-96-79-5.trex.outbound.svc.cluster.local [100.96.79.5]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 84F9F6A2171 for ; Tue, 7 May 2019 22:01:20 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a5.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.17.2); Tue, 07 May 2019 22:01:22 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Hysterical-Trouble: 6c0207490a70d473_1557266482197_382075682 X-MC-Loop-Signature: 1557266482197:2938379199 X-MC-Ingress-Time: 1557266482196 Original-Received: from pdx1-sub0-mail-a5.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a5.g.dreamhost.com (Postfix) with ESMTP id 2F4187FA55 for ; Tue, 7 May 2019 15:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:date:message-id:mime-version:content-type; s= linkov.net; bh=citivUQpPVNwToZeiC7T+QlVwCU=; b=LgfvoRnKNp9uGRcwo M6cCQIAT66opFsClXm7+MRi2YDtrpqF09zAfm4OEyTyYntD3BEmoAUolWwtGXSqL PzIawakShZVDq2nqlh6K4R9w4ulLnnv4wXwpD8DFHGexaHl9moCh+WM72NcKnSwl xgM+DQFLIFHpr0PHHADu3wLeRk= Original-Received: from mail.jurta.org (m91-129-99-37.cust.tele2.ee [91.129.99.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a5.g.dreamhost.com (Postfix) with ESMTPSA id A11327F9F5 for ; Tue, 7 May 2019 15:01:12 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a5 X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduuddrkedugddtgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufhofffkfgggtgesmhdtreertdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrdelledrfeejnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledrleelrdefjedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegsuhhgqdhgnhhuqdgvmhgrtghssehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:158896 Archived-At: --=-=-= Content-Type: text/plain bug#28466 caused a regression in 26.0.50. Maybe it's too late to fix it in the release branch, so the patch below is for master. The problem is that after the change a year and a half ago log-view-diff always falls back to the previous revision even when point is in the middle of the log buffer, and not after the last entry. This patch uses the previous revision only at the end of the log buffer: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=log-view-diff-eobp.patch diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index e47fad8908..1f7d578610 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el @@ -618,10 +618,9 @@ log-view-diff-common ;; When TO and FR are the same, or when point is on a line after ;; the last entry, look at the previous revision. (when (or (string-equal fr to) - (>= (point) - (save-excursion - (goto-char (car fr-entry)) - (forward-line)))) + (save-excursion + (goto-char end) + (eobp))) (setq fr (vc-call-backend log-view-vc-backend 'previous-revision nil fr))) (vc-diff-internal t (list log-view-vc-backend --=-=-=--