From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.bugs Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Date: Thu, 15 Oct 2020 09:08:45 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20763"; mail-complaints-to="usenet@ciao.gmane.io" To: 40967@debbugs.gnu.org, Nathan Moreau Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 15 10:10:12 2020 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 1kSyKy-0005L8-32 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Oct 2020 10:10:12 +0200 Original-Received: from localhost ([::1]:36400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSyKx-00030E-4o for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Oct 2020 04:10:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSyKo-0002zB-5E for bug-gnu-emacs@gnu.org; Thu, 15 Oct 2020 04:10:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSyKn-00054L-R9 for bug-gnu-emacs@gnu.org; Thu, 15 Oct 2020 04:10:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kSyKn-0001qr-Lt for bug-gnu-emacs@gnu.org; Thu, 15 Oct 2020 04:10:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Richard Copley Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Oct 2020 08:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40967 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.16027493597048 (code B ref 40967); Thu, 15 Oct 2020 08:10:01 +0000 Original-Received: (at 40967) by debbugs.gnu.org; 15 Oct 2020 08:09:19 +0000 Original-Received: from localhost ([127.0.0.1]:54159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSyK7-0001pc-Aw for submit@debbugs.gnu.org; Thu, 15 Oct 2020 04:09:19 -0400 Original-Received: from mail-ej1-f50.google.com ([209.85.218.50]:46068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kSyK6-0001pP-KV for 40967@debbugs.gnu.org; Thu, 15 Oct 2020 04:09:18 -0400 Original-Received: by mail-ej1-f50.google.com with SMTP id dt13so2237958ejb.12 for <40967@debbugs.gnu.org>; Thu, 15 Oct 2020 01:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=JU+J+WgBHrwaEmU3BRcjIcWg55OErNVIepKOWqNFoOw=; b=Adv9vsOdqvSIFvSz6XNxfAT42i6awIgxrQby2cRY5djR/1ahwogLh/D8byU9My6t+a X/TbKro4WlRLPq3wmhnRcf0X/fLfhCfiG1VEAoXieWVrVQVylpjNNOkWqK7OaWUOEFJ+ /ODvpg+g2jke9GTzLjyuY6NX/6Y8FmTAKUlFnW5giac4CMvx06j0U0tzCAgZKiQLnRJL eEtMx/HGvFa8NYOaj/7I2pKB93EsAer2fIDwExSuITQs3rE9QIfdzNkqQS6/bxGs3Xfk gSlBHV1/2CbQUuV4DeTSNaBoBJR00wyWmAAXb2Kf3RfNhp6jd+nSznJ3MXJQKwSbgOzW oDfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=JU+J+WgBHrwaEmU3BRcjIcWg55OErNVIepKOWqNFoOw=; b=FnlhIyA/iS6EiPkWfWhsckYtzrlnN4WuJZ+1LP9EMCd+eJAIfj5/OrO0ShSaUexpJe bRdP7x9YlSkTaGhoBYTvWd052W6Z8TyIKVOsTxwvq3F9eUBycQos4nhFyYXsI0D24hNN HMsMt3sPUjx6+sYmlvn6/iHAF5Ob3AGyhz9KDQkr3tBL+eJmgBeJlnCw6L78VxyTepY9 qFSeMIYAJvUvPDg9YnBOR504eOU4wh/8bPRGT76brdutQD2u17lKeS/AxVC+BA0KQHrv Pxhkzu3wgaJUz3Po/OaUrRuyoNCkTJZwE0QAD/1i2RUoKKiAona7e6MhvWvU7h9ZNPA6 CIHQ== X-Gm-Message-State: AOAM531y2xe1paKFErkGwDNzwMw5rZ5Ce0c9F0TpGzz7U0XawrJAkqwh BiXeFY8YuFFBrqpnlwmMIC6v9cznIv0etoSmCmvDTX+t X-Google-Smtp-Source: ABdhPJw6+dYpKzoZpgNy/pwknxJxworhH6JGi69tT7ek1maivSmGlG1/2K4s0m+xseOzfl3N0ZOssNfgTA2lNnu9UXQ= X-Received: by 2002:a17:906:3cc:: with SMTP id c12mr3140839eja.216.1602749352462; Thu, 15 Oct 2020 01:09:12 -0700 (PDT) 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:190556 Archived-At: In 'vc-revision-other-window', the 'switch-to-buffer-other-window' call is now wrapped in a 'with-current-buffer', and therefore 'vc-revision-other-window' no longer has the effect of switching buffer. This is unfortunate. See 'ediff-vc-internal': (vc-revision-other-window rev1) (setq rev1buf (current-buffer) file1 (buffer-file-name))) At this point, 'file1' is intended to be the name of the versioned backup file checked out by 'vc-revision-other-window'. With your change, instead 'file1' is the name of the base file. [...] (push (lambda () (ediff-delete-version-file file1) [...]) startup-hooks)) The startup-hooks function deletes the base file containing the local changes that the user wanted to examine, instead of the temporary backup file. Recipe, from emacs -Q: * visit a file under vc that has local changes * M-x ediff-revision RET RET RET RET By the time the Ediff control panel appears, the file has been deleted. That behaviour is, emphatically, NOT desirable. I'd even go as far as to suggest it should be fixed as a matter of urgency, or reverted for now. Just my opinion, of course.