From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#52349: 29.0.50; vc-git and diff-mode: stage hunks Date: Mon, 14 Feb 2022 00:41:04 +0200 Message-ID: <0415499a-d5c9-fabc-c8e5-34d2b3b3ffad@yandex.ru> References: <268cee0d-465d-b862-d1d6-f5da4d69e737@inventati.org> <9106387a-98cf-396f-bf45-ccb04581787b@yandex.ru> <864k7kfd56.fsf@mail.linkov.net> <86fsr3uen2.fsf@mail.linkov.net> <95d2d999-49ad-13c4-9f25-0935650a1e42@yandex.ru> <8635ktjfll.fsf@mail.linkov.net> <36b963e4-5af7-dd9e-af92-4404541b9f4d@yandex.ru> <86v8xjx45h.fsf@mail.linkov.net> <86y22esesn.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13096"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Cc: 52349@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 13 23:42:10 2022 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 1nJNZJ-0003E3-Ji for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 13 Feb 2022 23:42:09 +0100 Original-Received: from localhost ([::1]:39196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJNZI-0006eO-93 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 13 Feb 2022 17:42:08 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJNZC-0006eF-1T for bug-gnu-emacs@gnu.org; Sun, 13 Feb 2022 17:42:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJNZB-0002lm-OV for bug-gnu-emacs@gnu.org; Sun, 13 Feb 2022 17:42:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nJNZB-0006hz-NE for bug-gnu-emacs@gnu.org; Sun, 13 Feb 2022 17:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Feb 2022 22:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52349 X-GNU-PR-Package: emacs Original-Received: via spool by 52349-submit@debbugs.gnu.org id=B52349.164479207425731 (code B ref 52349); Sun, 13 Feb 2022 22:42:01 +0000 Original-Received: (at 52349) by debbugs.gnu.org; 13 Feb 2022 22:41:14 +0000 Original-Received: from localhost ([127.0.0.1]:39120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJNYP-0006gx-PH for submit@debbugs.gnu.org; Sun, 13 Feb 2022 17:41:13 -0500 Original-Received: from mail-wr1-f44.google.com ([209.85.221.44]:40921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJNYO-0006gj-2S for 52349@debbugs.gnu.org; Sun, 13 Feb 2022 17:41:12 -0500 Original-Received: by mail-wr1-f44.google.com with SMTP id j26so13221837wrb.7 for <52349@debbugs.gnu.org>; Sun, 13 Feb 2022 14:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=5SdEAWXji/aCOvr7k0cUMDbm9bZ+bsRhPsvT/TUaRPo=; b=dO9cfcf+V6GFIsiTm5AkKlz7VHNBvBJkLgf7tBHvbcRhG4d93idn3hKCRw5Y4YOEBU XzZs4w0J6gQ3Tt3vznRD/Fu6cnvlsSjlOp7GuafG6YbV//I+o9HGzDELuGweLeOThdhF RIGIYRtZLbZU05hNL5/JWcGLODa29McbdmnAEl7T63EDzqqTPJ7qbo8vOc6r5L+MWOMk OGumJX07nvwxGbCnexReIeOYjqrn3EbvbLjxtmfwRqknFFImT40rMXFDuoj3q/MZbQT5 5vb+f0rkxM5UysxAVwQFoiqYRu3Bf5QRfmNh3iW+IiZxElKCJ4g3LWUbAWQMiki40+3F +waQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=5SdEAWXji/aCOvr7k0cUMDbm9bZ+bsRhPsvT/TUaRPo=; b=RHmCIA8W7Irc6601IN2guYjqOqq/RjXM1n1nududOHR1BlMy+dIG21lUvxRFsQ+i0T kDjrzB8TPI++N/UEbPBhhOixhjBF77xG9d22TXMceWTTQxz1w+Jq5HOG78h6N+WfeSdU cmcxB9XDAkgbdjBBfyLU/hVUbjM0SAnz0teDb2vRWXFFxdCfe2o9CWU5vTPl0r0xuC80 gsLZqw03c2pniVZthL1hrYoT8xRFyJzy1/xwwKSGhBePGA+Ar2IHyT1s0bW/5Y6o9A57 r6lVqUnn32CgJxv21hC+0y63Lz9L6QAVkhJ7hmn3sTxtZ2+Y+ut1lYvS36a+NJQxdpRt zU8w== X-Gm-Message-State: AOAM5318ptzC6C2HGk4OR0TUi+ovScgC/BsdKTiamgJxSo5RmvoUlTlo 4CKUoNDMaC864kI173G67kk= X-Google-Smtp-Source: ABdhPJyr75O2e04BdFErnoQH2piD7NkfWiEu+Jr378VlREX4dWjvHY6tPJuBCrqHszi2/BoGCHeNVA== X-Received: by 2002:a05:6000:508:: with SMTP id a8mr9050696wrf.578.1644792066342; Sun, 13 Feb 2022 14:41:06 -0800 (PST) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id y1sm11823400wmi.36.2022.02.13.14.41.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Feb 2022 14:41:06 -0800 (PST) Content-Language: en-US In-Reply-To: <86y22esesn.fsf@mail.linkov.net> 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:226845 Archived-At: On 13.02.2022 21:56, Juri Linkov wrote: >> I suppose 'vc-diff-patch' could use a different buffer name than >> "*vc-diff*" and thus avoid reusing that buffer? >> >> If it brings other problems somehow, oh well. An old bug is something we >> can live with. > Indeed, other buffer names might break user configuration. > >> But also note that if the patch string was passed as an argument to the >> backend action, this problem might be avoided as well. > I can't imagine how the problem might be avoided using an argument. > The problem is in these lines in vc-finish-logentry: > > (pop-to-buffer vc-parent-buffer) > ;; OK, do it to it > (save-excursion > (funcall log-operation > log-fileset > log-entry)) > > It expects to pop to the original buffer where vc-next-action was initiated. OK, I see. Then I would try the other suggested option (using a different buffer name). If you're sure it will cause problems, I'm not going to press the issue, but FWIW I don't have (or know of) any customizations that this would break. Worst case, people would end up adding an additional entry to display-buffer-alist. And maybe to some similar vars as well. We could postpone solving this problem until later anyway, perhaps when someone complains. Or either of us gets bitten by it in practice.