From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Nathan Moreau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 29 Apr 2020 18:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40967 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 40967@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15881833102205 (code B ref -1); Wed, 29 Apr 2020 18:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2020 18:01:50 +0000 Received: from localhost ([127.0.0.1]:44500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTr1e-0000ZJ-HW for submit@debbugs.gnu.org; Wed, 29 Apr 2020 14:01:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:42286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTr1c-0000ZB-EL for submit@debbugs.gnu.org; Wed, 29 Apr 2020 14:01:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60336) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTr1b-0004AQ-JU for bug-gnu-emacs@gnu.org; Wed, 29 Apr 2020 14:01:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTr1Y-0000DJ-WF for bug-gnu-emacs@gnu.org; Wed, 29 Apr 2020 14:01:35 -0400 Received: from mail-vs1-f45.google.com ([209.85.217.45]:43722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTr1Y-0000DA-6I for bug-gnu-emacs@gnu.org; Wed, 29 Apr 2020 14:01:32 -0400 Received: by mail-vs1-f45.google.com with SMTP id m24so2000986vsq.10 for ; Wed, 29 Apr 2020 11:01:31 -0700 (PDT) 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=gT6Xm0+tnVlN8PxMI4UDe88KD1ZSQcPtni8tKWDnkWY=; b=gJ+qG7LFHZPzhbsuTDhSKYndGwb9VbcygDI6LY+eSrnQCUIDYA9WOL0dliHWp1lsva wYttg28/N7JAuzCKwyxdaxEwkYvmIKu1hBq4gdtzgSa0EIl1I04NYMx0l8MkpByDocSF giliuVV8dnyL48hMO1mx9dLik7S5Pjx+bLe1P3dBZb+AGrI8bkM2KP+3La2wo+SbSIk6 HF1+sCKQO5u8psiiNapZAsLUQGoBOzrB8Cmkk1+pRxWw9aQs2Kzgktt/X17QnApHPZzw +Ja4ztEAAhYuOECqmCMJSoX+3th+8on2XFy/VV0Zr/OViPnFdW3M1XCnYSRIOwPEuH8W sBdg== X-Gm-Message-State: AGi0PuZg8Vfc2yBuKo0Yk9dhkEzqyYGnyHlG1y+YqC4o3o66GydZYfVQ AhvrpnQRL289WsoEVu7jEWxxYk0zyfbjG4gN3IqbqNk8us4= X-Google-Smtp-Source: APiQypJPtIZdR6lfT40KG6KhaiP2616A3MFwf+2hOZHFpNMTOVuCwu6U0XSyi4gaNfwqnpAflMVCBsAwXl8dbLtoldw= X-Received: by 2002:a05:6102:3005:: with SMTP id s5mr24396131vsa.237.1588183290321; Wed, 29 Apr 2020 11:01:30 -0700 (PDT) MIME-Version: 1.0 From: Nathan Moreau Date: Wed, 29 Apr 2020 20:01:17 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000dc07a805a471bc96" Received-SPF: pass client-ip=209.85.217.45; envelope-from=nathanjmoreau@gmail.com; helo=mail-vs1-f45.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 14:01:31 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.217.45 X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Calling vc-diff does not work in indirect buffers. If the base buffer visits a file under version control, I expect it to behave as if called from the base buffer. The attached patch is a possible fix in that direction. I don't know if other commands in vc should have the same fix, should that kind of patch be applied. Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (nathanjmoreau[at]gmail.com) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) --000000000000dc07a805a471bc96 Content-Type: text/plain; charset="UTF-8" Calling vc-diff does not work in indirect buffers. If the base buffer visits a file under version control, I expect it to behave as if called from the base buffer. The attached patch is a possible fix in that direction. I don't know if other commands in vc should have the same fix, should that kind of patch be applied. Reproduction steps: =============== run emacs -Q open any file-under-version-control M-x clone-indirect-buffer In the new buffer, run vc-diff fails with `vc-deduce-fileset: Buffer [...] is not associated with a file` Details about the machine: ==================== Configured using: 'configure --without-dbus --host=x86_64-w64-mingw32 --without-compress-install -C 'CFLAGS=-O2 -static -g3'' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND NOTIFY W32NOTIFY ACL GNUTLS LIBXML2 HARFBUZZ ZLIB TOOLKIT_SCROLL_BARS MODULES THREADS PDUMPER LCMS2 GMP Important settings: value of $LANG: ENU locale-coding-system: cp65001 Major mode: Messages Minor modes in effect: global-subword-mode: t subword-mode: t save-place-mode: t minibuffer-depth-indicate-mode: t global-undo-tree-mode: t recentf-mode: t show-paren-mode: t global-auto-revert-mode: t savehist-mode: t delete-selection-mode: t override-global-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t column-number-mode: t line-number-mode: t global-visual-line-mode: t visual-line-mode: t transient-mark-mode: t Load-path shadows: ~/.emacs.d/swiper/elpa hides ~/.emacs.d/lispy/elpa Features: (shadow sort mail-extr emacsbug message rmc puny format-spec rfc822 mml mml-sec epa epg epg-config gnus-util rmail rmail-loaddefs time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils bookmark text-property-search pp smerge-mode tabify multiple-cursors-core rect eieio-opt speedbar sb-image ezimage dframe counsel xdg dired dired-loaddefs apropos go-mode url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util mailcap find-file ffap compile cl-print debug cus-start cus-load diff-hl face-remap vc-hg vc-dir vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs ewoc vc vc-dispatcher vc-git diff-mode lispy swiper lispy-inline noutline outline etags fileloop generator edebug backtrace help-fns radix-tree lispy-tags mode-local find-func rainbow-delimiters hl-todo pcase my-color-theme init my-init highlight-symbol thingatpt cap-words superword subword saveplace ace-link mb-depth hl-line battery undo-tree diff avy rx ivy-hydra ivy-xref ivy colir color ivy-overlay xref project recentf tree-widget wid-edit hydra lv hippie-exp comint ansi-color ring key-chord benchmark-init-modes paren elec-pair autorevert filenotify savehist delsel dabbrev cl-extra help-mode edmacro kmacro diminish cl use-package use-package-ensure use-package-delight use-package-diminish use-package-bind-key bind-key easy-mmode use-package-core derived benchmark-init advice info package easymenu browse-url url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json subr-x map url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel dos-w32 ls-lisp disp-table term/w32-win w32-win w32-vars term/common-win tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads w32notify w32 lcms2 multi-tty make-network-process emacs) Memory information: ((conses 16 311030 114283) (symbols 48 21138 1) (strings 32 60774 2776) (string-bytes 1 1941284) (vectors 16 26613) (vector-slots 8 306017 10984) (floats 8 293 480) (intervals 56 3804 12) (buffers 1000 24)) --000000000000dc07a805a471bc96 Content-Type: application/octet-stream; name="vc-diff-indirect-buffers.diff" Content-Disposition: attachment; filename="vc-diff-indirect-buffers.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k9ln9xds0 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMuZWwgYi9saXNwL3ZjL3ZjLmVsDQppbmRleCAxMzIyNzhl ODIzLi5kMWMzMzljNWI1IDEwMDY0NA0KLS0tIGEvbGlzcC92Yy92Yy5lbA0KKysrIGIvbGlzcC92 Yy92Yy5lbA0KQEAgLTE4NzQsOSArMTg3NCwxMCBAQCBzYXZpbmcgdGhlIGJ1ZmZlci4iDQogICAo aW50ZXJhY3RpdmUgKGxpc3QgY3VycmVudC1wcmVmaXgtYXJnIHQpKQ0KICAgKGlmIGhpc3Rvcmlj DQogICAgICAgKGNhbGwtaW50ZXJhY3RpdmVseSAndmMtdmVyc2lvbi1kaWZmKQ0KLSAgICAod2hl biBidWZmZXItZmlsZS1uYW1lICh2Yy1idWZmZXItc3luYyBub3QtdXJnZW50KSkNCi0gICAgKHZj LWRpZmYtaW50ZXJuYWwgdCAodmMtZGVkdWNlLWZpbGVzZXQgdCkgbmlsIG5pbA0KLQkJICAgICAg KGNhbGxlZC1pbnRlcmFjdGl2ZWx5LXAgJ2ludGVyYWN0aXZlKSkpKQ0KKyAgICAod2l0aC1jdXJy ZW50LWJ1ZmZlciAob3IgKGJ1ZmZlci1iYXNlLWJ1ZmZlcikgKGN1cnJlbnQtYnVmZmVyKSkNCisg ICAgICAod2hlbiBidWZmZXItZmlsZS1uYW1lICh2Yy1idWZmZXItc3luYyBub3QtdXJnZW50KSkN CisgICAgICAodmMtZGlmZi1pbnRlcm5hbCB0ICh2Yy1kZWR1Y2UtZmlsZXNldCB0KSBuaWwgbmls DQorICAgICAgICAgICAgICAgICAgICAgICAgKGNhbGxlZC1pbnRlcmFjdGl2ZWx5LXAgJ2ludGVy YWN0aXZlKSkpKSkNCiANCiA7OzsjIyNhdXRvbG9hZA0KIChkZWZ1biB2Yy1kaWZmLW1lcmdlYmFz ZSAoX2ZpbGVzIHJldjEgcmV2MikNCg== --000000000000dc07a805a471bc96-- From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 29 Apr 2020 18:14:02 +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: To: Nathan Moreau , 40967@debbugs.gnu.org Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.15881839943246 (code B ref 40967); Wed, 29 Apr 2020 18:14:02 +0000 Received: (at 40967) by debbugs.gnu.org; 29 Apr 2020 18:13:14 +0000 Received: from localhost ([127.0.0.1]:44509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTrCr-0000qH-O3 for submit@debbugs.gnu.org; Wed, 29 Apr 2020 14:13:13 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:51703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTrCq-0000q3-7z for 40967@debbugs.gnu.org; Wed, 29 Apr 2020 14:13:12 -0400 Received: by mail-wm1-f53.google.com with SMTP id x4so3101766wmj.1 for <40967@debbugs.gnu.org>; Wed, 29 Apr 2020 11:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=euZ5rR+Spz+kSScivdpA/rZCnTUNE99IZuznbGnLdAk=; b=u4gTBvEkKCjG0BbSwQOSxdNlBp1dL6e6KJjWZHJv8PX5SGTjvdcoLLQXb4qak1hvC3 6PS5RHYLzZY3lLxP7wx813QYs9sHUBD6yeciDQc7eFVnFzOlpyV0kJ8gzUUkt+r0L2I5 XTviZ33R4TaG3XSt5G7qTmfs8yjK24FzLLR+o9EMHr7CVvOLtLbz1KKcNpz76SpGWgRg J6rLNdRFmyY8ShdzGQViXu2cJm8on1nTS6uTRZUTyanJF79+qjpJgHXvDUYCmOIGY8Sh aVzg3yt+Auwi+bJbJ9KVk3OPlPcmORfXhEXwJ6HxaKpl5v7GRbIBUHroFhAZ7c0XSPyQ mjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=euZ5rR+Spz+kSScivdpA/rZCnTUNE99IZuznbGnLdAk=; b=jWVi/2C/74sALIGoR4LmTlRIYyz0WpqnAnMY95yq0xkYjrAzNRFK9JUcJRKHlmtezz Cyqxc0HIBSK+rMyLPel6Vm6NrpArn5zgUVF9mOWtZ6mBJn8MbNMJMamRuEk69rEWqCU9 AI/km5GAvA9MaCjWFPzK6eNxv4TNlxcBs/9IetzywgBnF6SD+TOl1xN6akxMj7txRKUY 7u9YpKJKn+iEpPWXsQNc9nH0YwY+U0afLC+/RXNeX4BP/Xmw6Ufj1lqhCO/uQ5rvYXYL gvrBJDRc6RTNgYcUwJtpQAa4cEcwlU+GZaW5ww5p+m/wgEGF9oNQICXQtasdxn2z5V/C zghQ== X-Gm-Message-State: AGi0Pua/jtkOEcAnCL+ZrrRySGp6vJy+d569Rpn3nXzMShVKJr5ea9so gJs8LiQJyw5b70BqgQjnmakeNIo6snc= X-Google-Smtp-Source: APiQypL/2qYU5G6nNsZYqGXMK3a27Pz/DTtGXt3qxEoQUdhK8tdmiR6iaNIm14Hx0iSy2lwc7DoGoQ== X-Received: by 2002:a7b:c3d4:: with SMTP id t20mr4820156wmj.170.1588183986200; Wed, 29 Apr 2020 11:13:06 -0700 (PDT) Received: from [192.168.0.2] ([66.205.73.129]) by smtp.googlemail.com with ESMTPSA id p6sm77385wrt.3.2020.04.29.11.13.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Apr 2020 11:13:05 -0700 (PDT) References: From: Dmitry Gutov Message-ID: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> Date: Wed, 29 Apr 2020 21:13:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 29.04.2020 21:01, Nathan Moreau wrote: > Reproduction steps: > =============== > run emacs -Q > open any file-under-version-control > M-x clone-indirect-buffer > In the new buffer, run vc-diff fails with `vc-deduce-fileset: Buffer > [...] is not associated with a file` I'm not sure we really want to support that workflow. Or else a lot of commands would have to be changed the same way, inside and outside of VC. But opinions welcome. From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Phil Sainty Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 16 Jun 2020 12:09: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: To: Dmitry Gutov , Nathan Moreau , 40967@debbugs.gnu.org Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.159230932827386 (code B ref 40967); Tue, 16 Jun 2020 12:09:01 +0000 Received: (at 40967) by debbugs.gnu.org; 16 Jun 2020 12:08:48 +0000 Received: from localhost ([127.0.0.1]:48429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlAOW-00077e-7J for submit@debbugs.gnu.org; Tue, 16 Jun 2020 08:08:48 -0400 Received: from smtp-1.orcon.net.nz ([60.234.4.34]:42019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlAOU-00077U-9Q for 40967@debbugs.gnu.org; Tue, 16 Jun 2020 08:08:46 -0400 Received: from [101.53.216.44] (port=5448 helo=[192.168.20.103]) by smtp-1.orcon.net.nz with esmtpa (Exim 4.90_1) (envelope-from ) id 1jlAOP-0002tq-6K; Wed, 17 Jun 2020 00:08:41 +1200 References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> From: Phil Sainty Message-ID: <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> Date: Wed, 17 Jun 2020 00:08:40 +1200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-GeoIP: NZ X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 30/04/20 6:13 am, Dmitry Gutov wrote: > On 29.04.2020 21:01, Nathan Moreau wrote: >> open any file-under-version-control >> M-x clone-indirect-buffer >> In the new buffer, run vc-diff fails with `vc-deduce-fileset: >> Buffer [...] is not associated with a file` > > I'm not sure we really want to support that workflow. Or else > a lot of commands would have to be changed the same way, > inside and outside of VC. > > But opinions welcome. FWIW, we did the same thing for `diff-buffer-with-file' quite recently: https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=1bcf5d02da96784a04034b4c0aba8fdfa1413c4e Personally I'd be ok with seeing piecemeal changes to commands like these to enable certain common workflows to DTRT with indirect buffers. I think there will likely be a subset of commands which are of higher value than others, and so there might not be such a vast number of things which are very useful to change in practice. (Or maybe it's a slippery slope.) Something like the following might be convenient: (defun buffer-base-buffer-file-name (&optional buffer) "Like `buffer-file-name', but also supporting indirect buffers." (buffer-file-name (or (buffer-base-buffer buffer) buffer (current-buffer)))) -Phil From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 16 Jun 2020 22:38: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: To: Phil Sainty , Nathan Moreau , 40967@debbugs.gnu.org Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.159234707422603 (code B ref 40967); Tue, 16 Jun 2020 22:38:01 +0000 Received: (at 40967) by debbugs.gnu.org; 16 Jun 2020 22:37:54 +0000 Received: from localhost ([127.0.0.1]:49842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlKDJ-0005sV-TJ for submit@debbugs.gnu.org; Tue, 16 Jun 2020 18:37:54 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:41797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlKDI-0005sG-8s for 40967@debbugs.gnu.org; Tue, 16 Jun 2020 18:37:52 -0400 Received: by mail-wr1-f45.google.com with SMTP id j10so284633wrw.8 for <40967@debbugs.gnu.org>; Tue, 16 Jun 2020 15:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Cj6uhpIs+FwB69d8U7pgSxxe0Xmtca5XPxLGrhcrZEo=; b=stwfnW86g1FbSgZsGlJfU7WId+TqF3cPBtIA8WH3gy8rPnlggyUoJs7Nm37OMCe88O uOqd8pNlb8cQbdTDa3yMYttkNkmgApUJLyYOIzZWJCjeaSYF43h+yAC68X1Vd+rkUnEi ++sjtN64Bw/JRaoAMe/wHV+1xZl47li7PhtEGQacfPahdKV3AJG+rNKWZ9gke2N4QC2h m07xrFgXd1ZS8WS5lRQ17OW/Ta/P3UfnC6h4Y1iP0WwHP7Ql3qc+4BFHJwHrPILE5u/7 WI9Y6s219tE0/SL/pCW1yjvD7Uf/o5/Qh9XPYYouS3aD4ydLAjmKMKzUw2mUV3OrnC0q uxwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Cj6uhpIs+FwB69d8U7pgSxxe0Xmtca5XPxLGrhcrZEo=; b=LFAsq5JFNL7BtTjKOcc7HVjfQLxpNUKnzNx1Ko6zXZvOrGsCm3sWaxadXS8HvcrGnJ c5FeHSrUeFht4LXPePebZ5W1wqv4fTtunbEHbO/Gxj1SSyLCZSDvkwOvvlKUT6Gbuhon lUpXl74yT30jZOEipKYodR7O/kCHtUTyrI13weAjfJeAKnYfb+V94RkralAHA72C788b XZ5m7puD+OThZvd7w/H8rOob6DkEkQDo+Dotg0dZ0fj5YMCUm4PfWqjl5Xy4Mm+NcZv/ qiLAG8n5DwVNVXPv9HrIiSEnCnDdH/OFvJsPMH1V4T75Xr8Z+/3OdtzjLM8UkG78Gss4 awOw== X-Gm-Message-State: AOAM533kTQfwJM6JRfHMpRcx52oCWH13RbEGlZyIHJIDH4TDMPSaLcjW SLgP55NNNKuseHUYDoVJIzZNGMAg X-Google-Smtp-Source: ABdhPJwVlK1RUakNFuzk7X+qzYJmT0SFXL3E/kWv1ayAbyc0P62Ncge/+Tn7Mo1+CTT8RhAf60h20A== X-Received: by 2002:a5d:5605:: with SMTP id l5mr5054957wrv.318.1592347066414; Tue, 16 Jun 2020 15:37:46 -0700 (PDT) Received: from [192.168.0.3] ([66.205.73.129]) by smtp.googlemail.com with ESMTPSA id o82sm6009134wmo.40.2020.06.16.15.37.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Jun 2020 15:37:45 -0700 (PDT) References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> From: Dmitry Gutov Message-ID: <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> Date: Wed, 17 Jun 2020 01:37:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 16.06.2020 15:08, Phil Sainty wrote: > Personally I'd be ok with seeing piecemeal changes to commands > like these to enable certain common workflows to DTRT with > indirect buffers. All right then. > I think there will likely be a subset of > commands which are of higher value than others, and so there > might not be such a vast number of things which are very useful > to change in practice. IDK, seems like it wouldn't simplify the proposed patch. It's short already anywa. From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Nathan Moreau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 01 Jul 2020 00:21:02 +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: To: Dmitry Gutov , 40967@debbugs.gnu.org, Phil Sainty Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.159356281811287 (code B ref 40967); Wed, 01 Jul 2020 00:21:02 +0000 Received: (at 40967) by debbugs.gnu.org; 1 Jul 2020 00:20:18 +0000 Received: from localhost ([127.0.0.1]:52003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqQU6-0002vy-IG for submit@debbugs.gnu.org; Tue, 30 Jun 2020 20:20:18 -0400 Received: from mail-vs1-f46.google.com ([209.85.217.46]:39835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqQU2-0002vi-Qc for 40967@debbugs.gnu.org; Tue, 30 Jun 2020 20:20:17 -0400 Received: by mail-vs1-f46.google.com with SMTP id a17so1432897vsq.6 for <40967@debbugs.gnu.org>; Tue, 30 Jun 2020 17:20:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=PlZ4E0kk5RYYxJSCwNuq1nksrOqptGaUGxcRSJzpnps=; b=K1VAakrfy4+CK6UjpRuh56A4gTkzikAYqzdJ4HOvtUvVCSSWpXMyr9wgV5TK76UG45 +eT/RkyByraEpXJU1zHvXh6K+6iWmxodO929HdeXIavQtdLJqqTPV71FoataSBorQVAO RCSR0JT/oJ6ub091sri5yLxBoHvr2uMgfe+w5aoQwHh4Oc/FuBmaG3UweniGVk4TdBuO JSSIt2fRZrXNklwIhawRARhxAXY2uul6gu7/xero/IxOlXoSECsN4vIP46pStQBgbkyw 7zlTmY8XT0rU+JrReX/eQfPzxuhe59k8ARRm0oJkS04sTpmzSlxl2FlZxfh1vk2aQQeU i9Xg== X-Gm-Message-State: AOAM533WROvbpfJs/51ahQhLI+uJqdOuaDmmtVFoJJywXRPNTQ6Js5LB ZFBrxakFxASRqpR4xQ1YIVx96zzcx+dOTUVKdKY= X-Google-Smtp-Source: ABdhPJwPNMqxU8TN4p8EZd4wubeGU4BYjk54t44kq2k9V6KiPaWfneP/POj7WguOf1obHMgaEreTjbsaKgeRWqIJ5Yc= X-Received: by 2002:a67:2c89:: with SMTP id s131mr15672610vss.26.1593562809218; Tue, 30 Jun 2020 17:20:09 -0700 (PDT) MIME-Version: 1.0 References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> In-Reply-To: <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> From: Nathan Moreau Date: Wed, 1 Jul 2020 02:19:56 +0200 Message-ID: Content-Type: multipart/mixed; boundary="0000000000002bd34f05a9564177" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --0000000000002bd34f05a9564177 Content-Type: text/plain; charset="UTF-8" Here is a new version of the patch, with support for most of the commands defined in vc.el. The support is not exhaustive as I was not able to make all commands work I did not succeed in testing all the commands: vc-delete-file and vc-rename-file are probably candidates next. Feedback is very welcome, I am not used to the contribution process on Emacs. Nathan On Wed, 17 Jun 2020 at 00:37, Dmitry Gutov wrote: > > On 16.06.2020 15:08, Phil Sainty wrote: > > Personally I'd be ok with seeing piecemeal changes to commands > > like these to enable certain common workflows to DTRT with > > indirect buffers. > > All right then. > > > I think there will likely be a subset of > > commands which are of higher value than others, and so there > > might not be such a vast number of things which are very useful > > to change in practice. > > IDK, seems like it wouldn't simplify the proposed patch. It's short > already anywa. --0000000000002bd34f05a9564177 Content-Type: application/octet-stream; name="vc-diff-indirect-buffers.diff" Content-Disposition: attachment; filename="vc-diff-indirect-buffers.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kc2m4xte0 Y29tbWl0IDQ2ODQxZDgyOGM2ZjFiYzk1MDQwMTkyNjZlNzhkN2M1NjU4NzE3MDAKQXV0aG9yOiBO YXRoYW4gTW9yZWF1IDxuYXRoYW4ubW9yZWF1QG00eC5vcmc+CkRhdGU6ICAgV2VkIEp1bCAxIDAy OjAyOjI1IDIwMjAgKzAyMDAKCiAgICBJbXByb3ZlIHN1cHBvcnQgZm9yIGluZGlyZWN0IGJ1ZmZl cnMuCiAgICAKICAgICogbGlzcC92Yy92Yy5lbCAodmMtZGVkdWNlLWZpbGVzZXQtMSk6IG5ldyBk ZWZ1bi4KICAgICh2Yy1kZWR1Y2UtZmlsZXNldCk6IGFkYXB0LgogICAgKHZjLW1heWJlLWJ1ZmZl ci1zeW5jKTogbmV3IGRlZnVuLgogICAgKHZjLWRpZmYpOiBhZGFwdC4KICAgICh2Yy1lZGlmZik6 IGFkYXB0LgogICAgKHZjLXJvb3QtZGlmZik6IGFkYXB0LgogICAgKHZjLXJldmlzaW9uLW90aGVy LXdpbmRvdyk6IGFkYXB0LgoKZGlmZiAtLWdpdCBsaXNwL3ZjL3ZjLmVsIGxpc3AvdmMvdmMuZWwK aW5kZXggYzY0MGJhMDQyMC4uMjkxZTEwYmM4YSAxMDA2NDQKLS0tIGxpc3AvdmMvdmMuZWwKKysr IGxpc3AvdmMvdmMuZWwKQEAgLTEwMjcsNyArMTAyNyw5IEBAIHZjLWRlZHVjZS1maWxlc2V0CiBs aXN0IG9mIG1hcmtlZCBmaWxlcywgb3IgdGhlIGN1cnJlbnQgZGlyZWN0b3J5IGlmIG5vIGZpbGVz IGFyZQogbWFya2VkLgogT3RoZXJ3aXNlLCBpZiB0aGUgY3VycmVudCBidWZmZXIgaXMgdmlzaXRp bmcgYSB2ZXJzaW9uLWNvbnRyb2xsZWQKLWZpbGUsIEZJTEVTRVQgaXMgYSBzaW5nbGUtZmlsZSBs aXN0IGNvbnRhaW5pbmcgdGhhdCBmaWxlJ3MgbmFtZS4KK2ZpbGUgb3IgaXMgYW4gaW5kaXJlY3Qg YnVmZmVyIHdob3NlIGJhc2UgYnVmZmVyIHZpc2l0cyBhCit2ZXJzaW9uLWNvbnRyb2xsZWQgZmls ZSwgRklMRVNFVCBpcyBhIHNpbmdsZS1maWxlIGxpc3QgY29udGFpbmluZwordGhhdCBmaWxlJ3Mg bmFtZS4KIE90aGVyd2lzZSwgaWYgQUxMT1ctVU5SRUdJU1RFUkVEIGlzIG5vbi1uaWwgYW5kIHRo ZSB2aXNpdGVkIGZpbGUKIGlzIHVucmVnaXN0ZXJlZCwgRklMRVNFVCBpcyBhIHNpbmdsZS1maWxl IGxpc3QgY29udGFpbmluZyB0aGUKIG5hbWUgb2YgdGhlIHZpc2l0ZWQgZmlsZS4KQEAgLTEwNDEs NiArMTA0MywxNCBAQCB2Yy1kZWR1Y2UtZmlsZXNldAogdGhlIHJldHVybmVkIGxpc3QuCiAKIEJF V0FSRTogdGhpcyBmdW5jdGlvbiBtYXkgY2hhbmdlIHRoZSBjdXJyZW50IGJ1ZmZlci4iCisgICh3 aXRoLWN1cnJlbnQtYnVmZmVyIChvciAoYnVmZmVyLWJhc2UtYnVmZmVyKSAoY3VycmVudC1idWZm ZXIpKQorICAgICh2Yy1kZWR1Y2UtZmlsZXNldC0xIG5vdC1zdGF0ZS1jaGFuZ2luZworICAgICAg ICAgICAgICAgICAgICAgICAgIGFsbG93LXVucmVnaXN0ZXJlZAorICAgICAgICAgICAgICAgICAg ICAgICAgIHN0YXRlLW1vZGVsLW9ubHktZmlsZXMpKSkKKworKGRlZnVuIHZjLWRlZHVjZS1maWxl c2V0LTEgKG5vdC1zdGF0ZS1jaGFuZ2luZworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFs bG93LXVucmVnaXN0ZXJlZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLW1vZGVs LW9ubHktZmlsZXMpCiAgIChsZXQgKGJhY2tlbmQpCiAgICAgKGNvbmQKICAgICAgKChkZXJpdmVk LW1vZGUtcCAndmMtZGlyLW1vZGUpCkBAIC0xMDYyLDcgKzEwNzIsNyBAQCB2Yy1kZWR1Y2UtZmls ZXNldAogCQkJCSAgICAgIChkZXJpdmVkLW1vZGUtcCAnZGlyZWQtbW9kZSkpKSkpCiAgICAgICAo cHJvZ24gICAgICAgICAgICAgICAgICA7RklYTUU6IFdoeSBub3QgYHdpdGgtY3VycmVudC1idWZm ZXInPyAtLVN0ZWYuCiAJKHNldC1idWZmZXIgdmMtcGFyZW50LWJ1ZmZlcikKLQkodmMtZGVkdWNl LWZpbGVzZXQgbm90LXN0YXRlLWNoYW5naW5nIGFsbG93LXVucmVnaXN0ZXJlZCBzdGF0ZS1tb2Rl bC1vbmx5LWZpbGVzKSkpCisJKHZjLWRlZHVjZS1maWxlc2V0LTEgbm90LXN0YXRlLWNoYW5naW5n IGFsbG93LXVucmVnaXN0ZXJlZCBzdGF0ZS1tb2RlbC1vbmx5LWZpbGVzKSkpCiAgICAgICgoYW5k IChkZXJpdmVkLW1vZGUtcCAnbG9nLXZpZXctbW9kZSkKIAkgICAoc2V0cSBiYWNrZW5kICh2Yy1y ZXNwb25zaWJsZS1iYWNrZW5kIGRlZmF1bHQtZGlyZWN0b3J5KSkpCiAgICAgICAobGlzdCBiYWNr ZW5kIG5pbCkpCkBAIC0xODc4LDYgKzE4ODgsMTAgQEAgdmMtcm9vdC12ZXJzaW9uLWRpZmYKICAg ICAgICB0IChsaXN0IGJhY2tlbmQgKGxpc3Qgcm9vdGRpcikpIHJldjEgcmV2MgogICAgICAgIChj YWxsZWQtaW50ZXJhY3RpdmVseS1wICdpbnRlcmFjdGl2ZSkpKSkpCiAKKyhkZWZ1biB2Yy1tYXli ZS1idWZmZXItc3luYyAobm90LXVyZ2VudCkKKyAgKHdpdGgtY3VycmVudC1idWZmZXIgKG9yIChi dWZmZXItYmFzZS1idWZmZXIpIChjdXJyZW50LWJ1ZmZlcikpCisgICAgKHdoZW4gYnVmZmVyLWZp bGUtbmFtZSAodmMtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkpKSkKKwogOzs7IyMjYXV0b2xvYWQK IChkZWZ1biB2Yy1kaWZmICgmb3B0aW9uYWwgaGlzdG9yaWMgbm90LXVyZ2VudCkKICAgIkRpc3Bs YXkgZGlmZnMgYmV0d2VlbiBmaWxlIHJldmlzaW9ucy4KQEAgLTE4OTAsNyArMTkwNCw3IEBAIHZj LWRpZmYKICAgKGludGVyYWN0aXZlIChsaXN0IGN1cnJlbnQtcHJlZml4LWFyZyB0KSkKICAgKGlm IGhpc3RvcmljCiAgICAgICAoY2FsbC1pbnRlcmFjdGl2ZWx5ICd2Yy12ZXJzaW9uLWRpZmYpCi0g ICAgKHdoZW4gYnVmZmVyLWZpbGUtbmFtZSAodmMtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkpCisg ICAgKHZjLW1heWJlLWJ1ZmZlci1zeW5jIG5vdC11cmdlbnQpCiAgICAgKHZjLWRpZmYtaW50ZXJu YWwgdCAodmMtZGVkdWNlLWZpbGVzZXQgdCkgbmlsIG5pbAogCQkgICAgICAoY2FsbGVkLWludGVy YWN0aXZlbHktcCAnaW50ZXJhY3RpdmUpKSkpCiAKQEAgLTE5NjksNyArMTk4Myw3IEBAIHZjLWVk aWZmCiAgIChpbnRlcmFjdGl2ZSAobGlzdCBjdXJyZW50LXByZWZpeC1hcmcgdCkpCiAgIChpZiBo aXN0b3JpYwogICAgICAgKGNhbGwtaW50ZXJhY3RpdmVseSAndmMtdmVyc2lvbi1lZGlmZikKLSAg ICAod2hlbiBidWZmZXItZmlsZS1uYW1lICh2Yy1idWZmZXItc3luYyBub3QtdXJnZW50KSkKKyAg ICAodmMtbWF5YmUtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkKICAgICAodmMtdmVyc2lvbi1lZGlm ZiAoY2FkciAodmMtZGVkdWNlLWZpbGVzZXQgdCkpIG5pbCBuaWwpKSkKIAogOzs7IyMjYXV0b2xv YWQKQEAgLTE5ODYsNyArMjAwMCw3IEBAIHZjLXJvb3QtZGlmZgogICAoaWYgaGlzdG9yaWMKICAg ICAgIDs7IFdlIHdhbnQgdGhlIGRpZmYgZm9yIHRoZSBWQyByb290IGRpci4KICAgICAgIChjYWxs LWludGVyYWN0aXZlbHkgJ3ZjLXJvb3QtdmVyc2lvbi1kaWZmKQotICAgICh3aGVuIGJ1ZmZlci1m aWxlLW5hbWUgKHZjLWJ1ZmZlci1zeW5jIG5vdC11cmdlbnQpKQorICAgICh2Yy1tYXliZS1idWZm ZXItc3luYyBub3QtdXJnZW50KQogICAgIChsZXQgKChiYWNrZW5kICh2Yy1kZWR1Y2UtYmFja2Vu ZCkpCiAJICAoZGVmYXVsdC1kaXJlY3RvcnkgZGVmYXVsdC1kaXJlY3RvcnkpCiAJICByb290ZGly IHdvcmtpbmctcmV2aXNpb24pCkBAIC0yMDI2LDE3ICsyMDQwLDE4IEBAIHZjLXJldmlzaW9uLW90 aGVyLXdpbmRvdwogSWYgdGhlIGN1cnJlbnQgZmlsZSBpcyBuYW1lZCBgRicsIHRoZSByZXZpc2lv biBpcyBuYW1lZCBgRi5+UkVWficuCiBJZiBgRi5+UkVWficgYWxyZWFkeSBleGlzdHMsIHVzZSBp dCBpbnN0ZWFkIG9mIGNoZWNraW5nIGl0IG91dCBhZ2Fpbi4iCiAgIChpbnRlcmFjdGl2ZQotICAg KHNhdmUtY3VycmVudC1idWZmZXIKKyAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIChvciAoYnVmZmVy LWJhc2UtYnVmZmVyKSAoY3VycmVudC1idWZmZXIpKQogICAgICAodmMtZW5zdXJlLXZjLWJ1ZmZl cikKICAgICAgKGxpc3QKICAgICAgICh2Yy1yZWFkLXJldmlzaW9uICJSZXZpc2lvbiB0byB2aXNp dCAoZGVmYXVsdCBpcyB3b3JraW5nIHJldmlzaW9uKTogIgogICAgICAgICAgICAgICAgICAgICAg ICAgKGxpc3QgYnVmZmVyLWZpbGUtbmFtZSkpKSkpCi0gICh2Yy1lbnN1cmUtdmMtYnVmZmVyKQot ICAobGV0KiAoKGZpbGUgYnVmZmVyLWZpbGUtbmFtZSkKLQkgKHJldmlzaW9uIChpZiAoc3RyaW5n LWVxdWFsIHJldiAiIikKLQkJICAgICAgKHZjLXdvcmtpbmctcmV2aXNpb24gZmlsZSkKLQkJICAg IHJldikpKQotICAgIChzd2l0Y2gtdG8tYnVmZmVyLW90aGVyLXdpbmRvdyAodmMtZmluZC1yZXZp c2lvbiBmaWxlIHJldmlzaW9uKSkpKQorICAod2l0aC1jdXJyZW50LWJ1ZmZlciAob3IgKGJ1ZmZl ci1iYXNlLWJ1ZmZlcikgKGN1cnJlbnQtYnVmZmVyKSkKKyAgICAodmMtZW5zdXJlLXZjLWJ1ZmZl cikKKyAgICAobGV0KiAoKGZpbGUgYnVmZmVyLWZpbGUtbmFtZSkKKwkgICAocmV2aXNpb24gKGlm IChzdHJpbmctZXF1YWwgcmV2ICIiKQorCQkgICAgICAgICAodmMtd29ya2luZy1yZXZpc2lvbiBm aWxlKQorCQkgICAgICAgcmV2KSkpCisgICAgICAoc3dpdGNoLXRvLWJ1ZmZlci1vdGhlci13aW5k b3cgKHZjLWZpbmQtcmV2aXNpb24gZmlsZSByZXZpc2lvbikpKSkpCiAKIChkZWZ1biB2Yy1maW5k LXJldmlzaW9uIChmaWxlIHJldmlzaW9uICZvcHRpb25hbCBiYWNrZW5kKQogICAiUmVhZCBSRVZJ U0lPTiBvZiBGSUxFIGludG8gYSBidWZmZXIgYW5kIHJldHVybiB0aGUgYnVmZmVyLgo= --0000000000002bd34f05a9564177-- From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Nathan Moreau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 09 Jul 2020 21:48:02 +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: To: Dmitry Gutov , 40967@debbugs.gnu.org, Phil Sainty Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.159433127929360 (code B ref 40967); Thu, 09 Jul 2020 21:48:02 +0000 Received: (at 40967) by debbugs.gnu.org; 9 Jul 2020 21:47:59 +0000 Received: from localhost ([127.0.0.1]:41762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jteOd-0007dT-Gv for submit@debbugs.gnu.org; Thu, 09 Jul 2020 17:47:59 -0400 Received: from mail-ua1-f50.google.com ([209.85.222.50]:37107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jteOb-0007dE-0u for 40967@debbugs.gnu.org; Thu, 09 Jul 2020 17:47:58 -0400 Received: by mail-ua1-f50.google.com with SMTP id q15so1196439uap.4 for <40967@debbugs.gnu.org>; Thu, 09 Jul 2020 14:47:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=VOG6IFuFrc+Auz+p0J4HcY8O/j4CtK1/MOws0UmzX9c=; b=Bmb2v0eiDgBH8xfaQEcquSzdVWI+Yraax0Hj6zF02FWPJqiGZgWx2S4yeUyC/iK7q6 RsIVjCZhrxlyRNbGcd6am/TxkhsP28ywFN3fak2L68KgtSDZs/+4U/2ltl+aHRaPyTz0 9c1Izc3SGXrltvFxRpTzgSDP1xJQT0gFjIObb28/0XXC5HQ5fjPHZcsKBjIr94okybHR 2oqRbdpUnsE79M9ULF0/TNYpKriTz+R9Jdl3BuWPMot7LaVSTNU6qyuyLFlf/Jsy540c ph6CZaBVzowwN0g8/vTz1lnGsPjD9eSPVcn8u97XEB3Utyl6OmWAlN7JqnaWQ9yGmLfI FKUg== X-Gm-Message-State: AOAM531w2mABuQDjwMo69avyLFe2wwRgdFwRARxDCgI6VGdlVYeU8JeZ bbqzJyu5M4bW18DMTFRh3xdZYmmcXz9/tCJJ5bg= X-Google-Smtp-Source: ABdhPJyobmr8GNDZwqjz6fbU+W0yiZiEhYE0T9y3lCgf1pzyURdAElxe689LC0nU1rDc6F2/R2KYWpnZD30iM81y8rA= X-Received: by 2002:a9f:22c4:: with SMTP id 62mr41664048uan.135.1594331271344; Thu, 09 Jul 2020 14:47:51 -0700 (PDT) MIME-Version: 1.0 References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> In-Reply-To: From: Nathan Moreau Date: Thu, 9 Jul 2020 23:47:40 +0200 Message-ID: Content-Type: multipart/alternative; boundary="0000000000001535c405aa092d0c" X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --0000000000001535c405aa092d0c Content-Type: text/plain; charset="UTF-8" Hello, Gentle ping. This can be rebased on whichever branch you like if it does not apply cleanly (currently it is based on d6f6353cfdbbea for because it happened to be checked-out locally). Nathan On Wed, 1 Jul 2020 at 02:19, Nathan Moreau wrote: > Here is a new version of the patch, with support for most of the > commands defined in vc.el. > > The support is not exhaustive as I was not able to make all commands work > I did not succeed in testing all the commands: vc-delete-file and > vc-rename-file are probably candidates next. > > Feedback is very welcome, I am not used to the contribution process on > Emacs. > Nathan > > On Wed, 17 Jun 2020 at 00:37, Dmitry Gutov wrote: > > > > On 16.06.2020 15:08, Phil Sainty wrote: > > > Personally I'd be ok with seeing piecemeal changes to commands > > > like these to enable certain common workflows to DTRT with > > > indirect buffers. > > > > All right then. > > > > > I think there will likely be a subset of > > > commands which are of higher value than others, and so there > > > might not be such a vast number of things which are very useful > > > to change in practice. > > > > IDK, seems like it wouldn't simplify the proposed patch. It's short > > already anywa. > --0000000000001535c405aa092d0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

Gentle ping. This can= be rebased on whichever branch you like if it does not apply cleanly (curr= ently it is based on d6f6353cfdbbea for because it happened to be checked-o= ut locally).

Nathan

On Wed, 1 Jul 202= 0 at 02:19, Nathan Moreau <nath= an.moreau@m4x.org> wrote:
Here is a new version of the patch, with support for most = of the
commands defined in vc.el.

The support is not exhaustive as I was not able to make all commands work I did not succeed in testing all the commands: vc-delete-file and
vc-rename-file are probably candidates next.

Feedback is very welcome, I am not used to the contribution process on Emac= s.
Nathan

On Wed, 17 Jun 2020 at 00:37, Dmitry Gutov <dgutov@yandex.ru> wrote:
>
> On 16.06.2020 15:08, Phil Sainty wrote:
> > Personally I'd be ok with seeing piecemeal changes to command= s
> > like these to enable certain common workflows to DTRT with
> > indirect buffers.
>
> All right then.
>
> > I think there will likely be a subset of
> > commands which are of higher value than others, and so there
> > might not be such a vast number of things which are very useful > > to change in practice.
>
> IDK, seems like it wouldn't simplify the proposed patch. It's = short
> already anywa.
--0000000000001535c405aa092d0c-- From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Oct 2020 17:57:02 +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: To: Nathan Moreau Cc: Phil Sainty , 40967@debbugs.gnu.org, Dmitry Gutov Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.160157498710321 (code B ref 40967); Thu, 01 Oct 2020 17:57:02 +0000 Received: (at 40967) by debbugs.gnu.org; 1 Oct 2020 17:56:27 +0000 Received: from localhost ([127.0.0.1]:38232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO2oc-0002gP-Vs for submit@debbugs.gnu.org; Thu, 01 Oct 2020 13:56:27 -0400 Received: from quimby.gnus.org ([95.216.78.240]:33602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO2ob-0002gB-2y for 40967@debbugs.gnu.org; Thu, 01 Oct 2020 13:56:25 -0400 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=zIGs5yAWhPgDR42AJyFuKfHasN6VG5yU6jAEJlm5K3Q=; b=P4y5KUcLdr7U94rsthbHoCy2HX 26/AJhTD0JMITjxQEL+BnubOtTgH9tB/y97APeqGtYAM8PiJIIPcHjN16pi96HuEZMDaKq3MoNgS4 WCL4a25sVe7h2rC8KBBIgzVPHpOY+6yO9xSOmT7VAeSEQLK2GhJ8lQlzguN5dY7C7ogg=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kO2oQ-0001K2-23; Thu, 01 Oct 2020 19:56:18 +0200 From: Lars Ingebrigtsen References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> X-Now-Playing: Nanang Tatang's _Muki_: "Bunny Hop Hop" Date: Thu, 01 Oct 2020 19:56:12 +0200 In-Reply-To: (Nathan Moreau's message of "Thu, 9 Jul 2020 23:47:40 +0200") Message-ID: <87d0214ypv.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Nathan Moreau writes: > Gentle ping. This can be rebased on whichever branch you like if it > does not apply cleanly (currently it is based on d6f6353cfdbbea for > because it happened to be checked-out locally). Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Nathan Moreau writes: > Gentle ping. This can be rebased on whichever branch you like if it > does not apply cleanly (currently it is based on d6f6353cfdbbea for > because it happened to be checked-out locally). The patch does not apply cleanly to Emacs 28, so I've respun it. There were some conflicts; please check that it looks correct. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 3852a64550..46c44fa54b 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1038,7 +1038,9 @@ vc-deduce-fileset list of marked files, or the current directory if no files are marked. Otherwise, if the current buffer is visiting a version-controlled -file, FILESET is a single-file list containing that file's name. +file or is an indirect buffer whose base buffer visits a +version-controlled file, FILESET is a single-file list containing +that file's name. Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file is unregistered, FILESET is a single-file list containing the name of the visited file. @@ -1052,6 +1054,14 @@ vc-deduce-fileset the returned list. BEWARE: this function may change the current buffer." + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) + (vc-deduce-fileset-1 not-state-changing + allow-unregistered + state-model-only-files))) + +(defun vc-deduce-fileset-1 (not-state-changing + allow-unregistered + state-model-only-files) (let (backend) (cond ((derived-mode-p 'vc-dir-mode) @@ -1073,7 +1083,7 @@ vc-deduce-fileset (derived-mode-p 'dired-mode))))) (progn ;FIXME: Why not `with-current-buffer'? --Stef. (set-buffer vc-parent-buffer) - (vc-deduce-fileset not-state-changing allow-unregistered state-model-only-files))) + (vc-deduce-fileset-1 not-state-changing allow-unregistered state-model-only-files))) ((and (not buffer-file-name) (setq backend (vc-responsible-backend default-directory))) (list backend nil)) @@ -1883,6 +1893,10 @@ vc-root-version-diff t (list backend (list rootdir)) rev1 rev2 (called-interactively-p 'interactive))))) +(defun vc-maybe-buffer-sync (not-urgent) + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) + (when buffer-file-name (vc-buffer-sync not-urgent)))) + ;;;###autoload (defun vc-diff (&optional historic not-urgent) "Display diffs between file revisions. @@ -1895,6 +1909,7 @@ vc-diff (interactive (list current-prefix-arg t)) (if historic (call-interactively 'vc-version-diff) + (vc-maybe-buffer-sync not-urgent) (let ((fileset (vc-deduce-fileset t))) (vc-buffer-sync-fileset fileset not-urgent) (vc-diff-internal t fileset nil nil @@ -1981,7 +1996,7 @@ vc-ediff (interactive (list current-prefix-arg t)) (if historic (call-interactively 'vc-version-ediff) - (when buffer-file-name (vc-buffer-sync not-urgent)) + (vc-maybe-buffer-sync not-urgent) (vc-version-ediff (cadr (vc-deduce-fileset t)) nil nil))) ;;;###autoload @@ -1998,7 +2013,7 @@ vc-root-diff (if historic ;; We want the diff for the VC root dir. (call-interactively 'vc-root-version-diff) - (when buffer-file-name (vc-buffer-sync not-urgent)) + (vc-maybe-buffer-sync not-urgent) (let ((backend (vc-deduce-backend)) (default-directory default-directory) rootdir working-revision) @@ -2038,17 +2053,18 @@ vc-revision-other-window If the current file is named `F', the revision is named `F.~REV~'. If `F.~REV~' already exists, use it instead of checking it out again." (interactive - (save-current-buffer + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) (vc-ensure-vc-buffer) (list (vc-read-revision "Revision to visit (default is working revision): " (list buffer-file-name))))) - (vc-ensure-vc-buffer) - (let* ((file buffer-file-name) - (revision (if (string-equal rev "") - (vc-working-revision file) - rev))) - (switch-to-buffer-other-window (vc-find-revision file revision)))) + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) + (vc-ensure-vc-buffer) + (let* ((file buffer-file-name) + (revision (if (string-equal rev "") + (vc-working-revision file) + rev))) + (switch-to-buffer-other-window (vc-find-revision file revision))))) (defun vc-find-revision (file revision &optional backend) "Read REVISION of FILE into a buffer and return the buffer. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Nathan Moreau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Oct 2020 00:28:02 +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: To: Lars Ingebrigtsen Cc: Phil Sainty , 40967@debbugs.gnu.org, Dmitry Gutov Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.160159848115498 (code B ref 40967); Fri, 02 Oct 2020 00:28:02 +0000 Received: (at 40967) by debbugs.gnu.org; 2 Oct 2020 00:28:01 +0000 Received: from localhost ([127.0.0.1]:38746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO8vY-00041t-CF for submit@debbugs.gnu.org; Thu, 01 Oct 2020 20:28:00 -0400 Received: from mail-vk1-f181.google.com ([209.85.221.181]:42024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO8vV-00041g-Q4 for 40967@debbugs.gnu.org; Thu, 01 Oct 2020 20:27:59 -0400 Received: by mail-vk1-f181.google.com with SMTP id b4so123048vkh.9 for <40967@debbugs.gnu.org>; Thu, 01 Oct 2020 17:27:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iRlENu/t/qQURuMgk/X7bgxpE1uEhGoeZ80gIJ8YRKg=; b=rqX2pHHLxqyLW5ZnNIFnjdOpdHq8y7mp5rNYtrsp3bpLIw1//ZQKaqsY39Y4irplmQ CSkt5XbKgPcliADkfdskoS+w+hu4z2xRP9ZNZ6vDI4b1rkgQAwFAu3s1EJz0+t9cw5wu p5LfdjRN9N7QYoejWVRnTveF4nFGxNbFDAIPK0+SdYEjFvRLu/kyq3FbK83hM7UzFo5/ 11Ks1M2z3Jg04q5DmeHstfB5A7zA+TuMuYXz72LxTRTNYAOO8cvGWWXWNyzyWhyi6JxP AWbGpbFdrZQIv3pkMBcTzvTir3oobeeKVvgLlInEm5HGBDEJ/JAGjqi3q9P/Nsz62HZT Yyjw== X-Gm-Message-State: AOAM532hdooz9d/muHgcptftxz6DasoKmjq0kdCU/ph+EtnPZijy41CK wX7WT4878OQFNn5W9VLonvaJEkw4NbP3QSZI8bI= X-Google-Smtp-Source: ABdhPJzpFpsDzKQv/n9aaId1p92acofpSSEBNvK0z0ArqKETtY0JFJP/rFoAyfIkAlRbZzH/usr2Pmr14B/2mncOvuc= X-Received: by 2002:ac5:ccd3:: with SMTP id j19mr7049032vkn.8.1601598472161; Thu, 01 Oct 2020 17:27:52 -0700 (PDT) MIME-Version: 1.0 References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> <87d0214ypv.fsf@gnus.org> In-Reply-To: <87d0214ypv.fsf@gnus.org> From: Nathan Moreau Date: Fri, 2 Oct 2020 02:27:40 +0200 Message-ID: Content-Type: multipart/alternative; boundary="000000000000018e6b05b0a534d3" X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --000000000000018e6b05b0a534d3 Content-Type: text/plain; charset="UTF-8" Hi Lars, Thanks for having a look. This looks good to me. Best regards, Nathan On Thu, 1 Oct 2020 at 19:56, Lars Ingebrigtsen wrote: > Nathan Moreau writes: > > > Gentle ping. This can be rebased on whichever branch you like if it > > does not apply cleanly (currently it is based on d6f6353cfdbbea for > > because it happened to be checked-out locally). > > The patch does not apply cleanly to Emacs 28, so I've respun it. There > were some conflicts; please check that it looks correct. > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index 3852a64550..46c44fa54b 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -1038,7 +1038,9 @@ vc-deduce-fileset > list of marked files, or the current directory if no files are > marked. > Otherwise, if the current buffer is visiting a version-controlled > -file, FILESET is a single-file list containing that file's name. > +file or is an indirect buffer whose base buffer visits a > +version-controlled file, FILESET is a single-file list containing > +that file's name. > Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file > is unregistered, FILESET is a single-file list containing the > name of the visited file. > @@ -1052,6 +1054,14 @@ vc-deduce-fileset > the returned list. > > BEWARE: this function may change the current buffer." > + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) > + (vc-deduce-fileset-1 not-state-changing > + allow-unregistered > + state-model-only-files))) > + > +(defun vc-deduce-fileset-1 (not-state-changing > + allow-unregistered > + state-model-only-files) > (let (backend) > (cond > ((derived-mode-p 'vc-dir-mode) > @@ -1073,7 +1083,7 @@ vc-deduce-fileset > (derived-mode-p 'dired-mode))))) > (progn ;FIXME: Why not `with-current-buffer'? > --Stef. > (set-buffer vc-parent-buffer) > - (vc-deduce-fileset not-state-changing allow-unregistered > state-model-only-files))) > + (vc-deduce-fileset-1 not-state-changing allow-unregistered > state-model-only-files))) > ((and (not buffer-file-name) > (setq backend (vc-responsible-backend default-directory))) > (list backend nil)) > @@ -1883,6 +1893,10 @@ vc-root-version-diff > t (list backend (list rootdir)) rev1 rev2 > (called-interactively-p 'interactive))))) > > +(defun vc-maybe-buffer-sync (not-urgent) > + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) > + (when buffer-file-name (vc-buffer-sync not-urgent)))) > + > ;;;###autoload > (defun vc-diff (&optional historic not-urgent) > "Display diffs between file revisions. > @@ -1895,6 +1909,7 @@ vc-diff > (interactive (list current-prefix-arg t)) > (if historic > (call-interactively 'vc-version-diff) > + (vc-maybe-buffer-sync not-urgent) > (let ((fileset (vc-deduce-fileset t))) > (vc-buffer-sync-fileset fileset not-urgent) > (vc-diff-internal t fileset nil nil > @@ -1981,7 +1996,7 @@ vc-ediff > (interactive (list current-prefix-arg t)) > (if historic > (call-interactively 'vc-version-ediff) > - (when buffer-file-name (vc-buffer-sync not-urgent)) > + (vc-maybe-buffer-sync not-urgent) > (vc-version-ediff (cadr (vc-deduce-fileset t)) nil nil))) > > ;;;###autoload > @@ -1998,7 +2013,7 @@ vc-root-diff > (if historic > ;; We want the diff for the VC root dir. > (call-interactively 'vc-root-version-diff) > - (when buffer-file-name (vc-buffer-sync not-urgent)) > + (vc-maybe-buffer-sync not-urgent) > (let ((backend (vc-deduce-backend)) > (default-directory default-directory) > rootdir working-revision) > @@ -2038,17 +2053,18 @@ vc-revision-other-window > If the current file is named `F', the revision is named `F.~REV~'. > If `F.~REV~' already exists, use it instead of checking it out again." > (interactive > - (save-current-buffer > + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) > (vc-ensure-vc-buffer) > (list > (vc-read-revision "Revision to visit (default is working revision): > " > (list buffer-file-name))))) > - (vc-ensure-vc-buffer) > - (let* ((file buffer-file-name) > - (revision (if (string-equal rev "") > - (vc-working-revision file) > - rev))) > - (switch-to-buffer-other-window (vc-find-revision file revision)))) > + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) > + (vc-ensure-vc-buffer) > + (let* ((file buffer-file-name) > + (revision (if (string-equal rev "") > + (vc-working-revision file) > + rev))) > + (switch-to-buffer-other-window (vc-find-revision file revision))))) > > (defun vc-find-revision (file revision &optional backend) > "Read REVISION of FILE into a buffer and return the buffer. > > > -- > (domestic pets only, the antidote for overdose, milk.) > bloggy blog: http://lars.ingebrigtsen.no > --000000000000018e6b05b0a534d3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Lars,

Thanks for having a= look. This looks good to me.

Best regards,
<= div>Nathan

On Thu, 1 Oct 2020 at 19:56, Lars Ingebrigtsen <larsi@gnus.org> wrote:
Nathan Moreau <nathan.moreau@m4x.org>= writes:

> Gentle ping. This can be rebased on whichever branch you like if it > does not apply cleanly (currently it is based on d6f6353cfdbbea for > because it happened to be checked-out locally).

The patch does not apply cleanly to Emacs 28, so I've respun it.=C2=A0 = There
were some conflicts; please check that it looks correct.

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3852a64550..46c44fa54b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1038,7 +1038,9 @@ vc-deduce-fileset
=C2=A0list of marked files, or the current directory if no files are
=C2=A0marked.
=C2=A0Otherwise, if the current buffer is visiting a version-controlled
-file, FILESET is a single-file list containing that file's name.
+file or is an indirect buffer whose base buffer visits a
+version-controlled file, FILESET is a single-file list containing
+that file's name.
=C2=A0Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file
=C2=A0is unregistered, FILESET is a single-file list containing the
=C2=A0name of the visited file.
@@ -1052,6 +1054,14 @@ vc-deduce-fileset
=C2=A0the returned list.

=C2=A0BEWARE: this function may change the current buffer."
+=C2=A0 (with-current-buffer (or (buffer-base-buffer) (current-buffer))
+=C2=A0 =C2=A0 (vc-deduce-fileset-1 not-state-changing
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0allow-unregistered
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0state-model-only-files)))
+
+(defun vc-deduce-fileset-1 (not-state-changing
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 allow-unregistered
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 state-model-only-files)
=C2=A0 =C2=A0(let (backend)
=C2=A0 =C2=A0 =C2=A0(cond
=C2=A0 =C2=A0 =C2=A0 ((derived-mode-p 'vc-dir-mode)
@@ -1073,7 +1083,7 @@ vc-deduce-fileset
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (derived-mode-p= 'dired-mode)))))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(progn=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 ;FIXME: Why not `with-current-buffer'? --Stef.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (set-buffer vc-parent-buffer)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(vc-deduce-fileset not-state-changing allow-unr= egistered state-model-only-files)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0(vc-deduce-fileset-1 not-state-changing allow-u= nregistered state-model-only-files)))
=C2=A0 =C2=A0 =C2=A0 ((and (not buffer-file-name)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(setq backend (vc-responsible-back= end default-directory)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(list backend nil))
@@ -1883,6 +1893,10 @@ vc-root-version-diff
=C2=A0 =C2=A0 =C2=A0 =C2=A0 t (list backend (list rootdir)) rev1 rev2
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (called-interactively-p 'interactive)))))
+(defun vc-maybe-buffer-sync (not-urgent)
+=C2=A0 (with-current-buffer (or (buffer-base-buffer) (current-buffer))
+=C2=A0 =C2=A0 (when buffer-file-name (vc-buffer-sync not-urgent))))
+
=C2=A0;;;###autoload
=C2=A0(defun vc-diff (&optional historic not-urgent)
=C2=A0 =C2=A0"Display diffs between file revisions.
@@ -1895,6 +1909,7 @@ vc-diff
=C2=A0 =C2=A0(interactive (list current-prefix-arg t))
=C2=A0 =C2=A0(if historic
=C2=A0 =C2=A0 =C2=A0 =C2=A0(call-interactively 'vc-version-diff)
+=C2=A0 =C2=A0 (vc-maybe-buffer-sync not-urgent)
=C2=A0 =C2=A0 =C2=A0(let ((fileset (vc-deduce-fileset t)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(vc-buffer-sync-fileset fileset not-urgent)
=C2=A0 =C2=A0 =C2=A0 =C2=A0(vc-diff-internal t fileset nil nil
@@ -1981,7 +1996,7 @@ vc-ediff
=C2=A0 =C2=A0(interactive (list current-prefix-arg t))
=C2=A0 =C2=A0(if historic
=C2=A0 =C2=A0 =C2=A0 =C2=A0(call-interactively 'vc-version-ediff)
-=C2=A0 =C2=A0 (when buffer-file-name (vc-buffer-sync not-urgent))
+=C2=A0 =C2=A0 (vc-maybe-buffer-sync not-urgent)
=C2=A0 =C2=A0 =C2=A0(vc-version-ediff (cadr (vc-deduce-fileset t)) nil nil)= ))

=C2=A0;;;###autoload
@@ -1998,7 +2013,7 @@ vc-root-diff
=C2=A0 =C2=A0(if historic
=C2=A0 =C2=A0 =C2=A0 =C2=A0;; We want the diff for the VC root dir.
=C2=A0 =C2=A0 =C2=A0 =C2=A0(call-interactively 'vc-root-version-diff) -=C2=A0 =C2=A0 (when buffer-file-name (vc-buffer-sync not-urgent))
+=C2=A0 =C2=A0 (vc-maybe-buffer-sync not-urgent)
=C2=A0 =C2=A0 =C2=A0(let ((backend (vc-deduce-backend))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (default-directory default-directory) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rootdir working-revision)
@@ -2038,17 +2053,18 @@ vc-revision-other-window
=C2=A0If the current file is named `F', the revision is named `F.~REV~&= #39;.
=C2=A0If `F.~REV~' already exists, use it instead of checking it out ag= ain."
=C2=A0 =C2=A0(interactive
-=C2=A0 =C2=A0(save-current-buffer
+=C2=A0 =C2=A0(with-current-buffer (or (buffer-base-buffer) (current-buffer= ))
=C2=A0 =C2=A0 =C2=A0 (vc-ensure-vc-buffer)
=C2=A0 =C2=A0 =C2=A0 (list
=C2=A0 =C2=A0 =C2=A0 =C2=A0(vc-read-revision "Revision to visit (defau= lt is working revision): "
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0(list buffer-file-name)))))
-=C2=A0 (vc-ensure-vc-buffer)
-=C2=A0 (let* ((file buffer-file-name)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 (revision (if (string-equal rev "")<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0(vc-working-revision file)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rev))= )
-=C2=A0 =C2=A0 (switch-to-buffer-other-window (vc-find-revision file revisi= on))))
+=C2=A0 (with-current-buffer (or (buffer-base-buffer) (current-buffer))
+=C2=A0 =C2=A0 (vc-ensure-vc-buffer)
+=C2=A0 =C2=A0 (let* ((file buffer-file-name)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (revision (if (string-equal rev "&= quot;)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 (vc-working-revision file)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 rev)))
+=C2=A0 =C2=A0 =C2=A0 (switch-to-buffer-other-window (vc-find-revision file= revision)))))

=C2=A0(defun vc-find-revision (file revision &optional backend)
=C2=A0 =C2=A0"Read REVISION of FILE into a buffer and return the buffe= r.


--
(domestic pets only, the antidote for overdose, milk.)
=C2=A0 =C2=A0bloggy blog: http://lars.ingebrigtsen.no
--000000000000018e6b05b0a534d3-- From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Oct 2020 17:35: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: To: Nathan Moreau Cc: Phil Sainty , 40967@debbugs.gnu.org, Dmitry Gutov Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.160174644532445 (code B ref 40967); Sat, 03 Oct 2020 17:35:01 +0000 Received: (at 40967) by debbugs.gnu.org; 3 Oct 2020 17:34:05 +0000 Received: from localhost ([127.0.0.1]:44374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOlQ5-0008RF-9x for submit@debbugs.gnu.org; Sat, 03 Oct 2020 13:34:05 -0400 Received: from quimby.gnus.org ([95.216.78.240]:55612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOlQ3-0008Ql-Ic for 40967@debbugs.gnu.org; Sat, 03 Oct 2020 13:34:04 -0400 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=zVK8EQwSPn0vUPk45NaClfOtVowZSpih+HjdFAC+khg=; b=f3vhLElDB4vSqNcZX4fC1pLdxy DShMNtl33oDH7pbnMkmssMyofeTxBHq5rAoXtsQy8OhDI5t+dixey+l6w0KNm6DkZ9L6QFLZiNVBh 5TDMEJW4EHvZeGZhlaWvtFiKmDCjEG0t+eAV/xZf63JddYX2mXF6amPjnj7KePWQ0Ats=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kOlPs-0000ja-E2; Sat, 03 Oct 2020 19:33:57 +0200 From: Lars Ingebrigtsen References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> <87d0214ypv.fsf@gnus.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAG1BMVEUFBAUmGDNMMTe0 SCi/k1G8rpzk3cz9/f3///+cFMj3AAAAAWJLR0QIht6VegAAAAd0SU1FB+QKAxEVEVnlS9oAAAGa SURBVDjLfZRNc5swEIY3DL1bDr2DEPc2qOk1gZVzbQgi14wH0D2Tor/fFTgYK3JfgWD2YfXxLgBw XXseUEqgDOnOB3Jun6CW1MoacbmTJS5AonQqcbnKFdBzkk43RF1uM65Nnl8Dgudu5XgWzVoR6MaA egLGWjuozl7o7wIauGFPAfBOfZS/fgXOMRjQ+OB9NrkY7n3wNoPvxdB5YB4JvtVKd5dgN4OoaVHp cbST28eRIiMV0SW9UHxV45YDUVlSlvjVFqewUg4YxHEg05L2Ida6Wxz6OFli+x00RRMdzMmrFUw/ II17UONozDiZM7B/gMd6V/juWnuEhOm0aNV5VctQPcSPh0dBMUTV4gp4D9FzIrDKJaLWw/EEnoEB VFo0+cFsbJ8ygJsd7V/dvm69mvvZrvTglfZhAVns1/wjXRLufTC9cMaA698+sFNbcr5vn74AQgNK EQLOYW7CwH+vNgW9LG3wqyUvgAXlwB6ZqBgyKTMhfyaYifoMkNWuo+h8fIIsqVZwuwVMZG4ol+ky qGf/nTwM2JV/0j//Gg73lH+4MQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0xMC0wM1QxNzoyMTox NyswMDowMB7s4ocAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMTAtMDNUMTc6MjE6MTcrMDA6MDBv sVo7AAAAAElFTkSuQmCC X-Now-Playing: Brian Eno, Jah Wobble's _Spinner_: "Left Where It Fell" Date: Sat, 03 Oct 2020 19:33:51 +0200 In-Reply-To: (Nathan Moreau's message of "Fri, 2 Oct 2020 02:27:40 +0200") Message-ID: <87eemfuscg.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Nathan Moreau writes: > Thanks for having a look. This looks good to me. Dmitry, do you have any comments here? The feature makes sense to me conceptually, but I'm not a domain expert. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Nathan Moreau writes: > Thanks for having a look. This looks good to me. Dmitry, do you have any comments here? The feature makes sense to me conceptually, but I'm not a domain expert. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 03 Oct 2020 18:33:02 +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: To: Lars Ingebrigtsen , Nathan Moreau Cc: Phil Sainty , 40967@debbugs.gnu.org Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.16017499595374 (code B ref 40967); Sat, 03 Oct 2020 18:33:02 +0000 Received: (at 40967) by debbugs.gnu.org; 3 Oct 2020 18:32:39 +0000 Received: from localhost ([127.0.0.1]:44462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOmKk-0001Ob-Pc for submit@debbugs.gnu.org; Sat, 03 Oct 2020 14:32:39 -0400 Received: from mail-ej1-f49.google.com ([209.85.218.49]:34110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kOmKi-0001OP-Tp for 40967@debbugs.gnu.org; Sat, 03 Oct 2020 14:32:37 -0400 Received: by mail-ej1-f49.google.com with SMTP id u8so6195133ejg.1 for <40967@debbugs.gnu.org>; Sat, 03 Oct 2020 11:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=VwtSl5NH6OI931D32DLdBO9/r9JagY2JeoD360ilOUc=; b=UobRtqEdrnRAestJNNxZR7AlX/gaP/cNmnmf3o6imiRJhy94wl8D0JrmIyA+feBlkF TMlx4u3v4JeeDGRS09FfqH+7ypqHmzKLB1eC+jy2TclvEtmftwMtziDO5L8FsIsbL0hm qNda8GzDXuIUxmVaZ1sw05ZvSfHiIWQmXP2rRjVNWPeZ+k6E62i3WmQWuullqNYttzap uNKpHHLAwhV4oaE/qO/BKd0dI+429h83QPI97C3oEQ5cvlH3JyYg/b6FfF8QqW5yVvYh kQIuglA35GovoT14tHccrqSlwwf5WHkBnof0ra1wTNvhRnag1VExCquq7hpnbvOYBTTR /iSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=VwtSl5NH6OI931D32DLdBO9/r9JagY2JeoD360ilOUc=; b=OAvGIkj5BCvx4+iTKIyEEgkMiQLOtxt67pBxkDYZz/VGcDYr2eIXbdOvqnZycvt9OX nQbongWk7LZ75f57PSzrRvWTEXDaOvFSbTBL/wIIAzV3OtX08copg0X6pDKHaJuDJh2r Y1fTJHJoC07FNqCAIR1h65qXB/sYNI6wp8h13eNuVJdeMvo8d1WGaiAvWATrStKsNWqZ WZu8EDuOKU82VktrBDLqTLJZdxZJNpn8oyoopDY682N6SM331n5d4T2Pqn2JFLeb0M12 uaM2FYqjggbQIGEgReMaQLV9QF4cfvrCMRO4iva5lW7L3K0RzWDOrtFAvtxq++2HzBiC O6Ig== X-Gm-Message-State: AOAM5306QBxrLq04NRuNoS57WhncJDsZr/IhSNO1nDipOhOHxAKw1bgh Zxmb2CCi6+sDiSkhICkgfBgWMUZVr71trQ== X-Google-Smtp-Source: ABdhPJy/MFWITsLr4Ad5nSMtQ1H/OqY3QBCo6HSTzpvQSTskTaRBNA7Q7ozHAJg6IQd8HddPbuG1Qg== X-Received: by 2002:a17:906:a8b:: with SMTP id y11mr7500135ejf.302.1601749950909; Sat, 03 Oct 2020 11:32:30 -0700 (PDT) Received: from [192.168.0.4] ([66.205.71.3]) by smtp.googlemail.com with ESMTPSA id d13sm4817768edu.54.2020.10.03.11.32.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Oct 2020 11:32:30 -0700 (PDT) References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> <87d0214ypv.fsf@gnus.org> <87eemfuscg.fsf@gnus.org> From: Dmitry Gutov Message-ID: <2427bd4f-2523-7232-5678-432d3cc87531@yandex.ru> Date: Sat, 3 Oct 2020 21:32:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <87eemfuscg.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 03.10.2020 20:33, Lars Ingebrigtsen wrote: > Nathan Moreau writes: > >> Thanks for having a look. This looks good to me. > > Dmitry, do you have any comments here? The feature makes sense to me > conceptually, but I'm not a domain expert. No objections from me. I'm not a fan of using indirect buffers like this, but if you like the feature, and the patch works well for you, please go ahead. From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 05 Oct 2020 06:52:02 +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: To: Dmitry Gutov Cc: Phil Sainty , Nathan Moreau , 40967@debbugs.gnu.org Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.160188066315891 (code B ref 40967); Mon, 05 Oct 2020 06:52:02 +0000 Received: (at 40967) by debbugs.gnu.org; 5 Oct 2020 06:51:03 +0000 Received: from localhost ([127.0.0.1]:47554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPKKt-00048F-2t for submit@debbugs.gnu.org; Mon, 05 Oct 2020 02:51:03 -0400 Received: from quimby.gnus.org ([95.216.78.240]:45410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPKKr-00047j-HA for 40967@debbugs.gnu.org; Mon, 05 Oct 2020 02:51:02 -0400 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=Ffyqoik9E0Y8mjD4F44/3JP9CbhNh2/lIFYAOGg6VSI=; b=l1CKSWtynZmlR/7t8neUAMqsie +ZOkc5i+d7bcXjj8tCaxD0RueTU0AmZUYRP66gge53i0+ORyVXpWmgdhGBcgr4tcPieBK2C7tRQ2q /hUY/k3Fvzkk7LXjrBp7Gu8cyc37x86fbp7AygEvT9CguOHFadVGq6CYpNA1qAzIpjrQ=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kPKKh-0004a4-Mh; Mon, 05 Oct 2020 08:50:55 +0200 From: Lars Ingebrigtsen References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> <87d0214ypv.fsf@gnus.org> <87eemfuscg.fsf@gnus.org> <2427bd4f-2523-7232-5678-432d3cc87531@yandex.ru> X-Now-Playing: Stereolab's _Margerine Eclipse_: "Margerine Melodie" Date: Mon, 05 Oct 2020 08:50:50 +0200 In-Reply-To: <2427bd4f-2523-7232-5678-432d3cc87531@yandex.ru> (Dmitry Gutov's message of "Sat, 3 Oct 2020 21:32:28 +0300") Message-ID: <87y2klqi7p.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov writes: > No objections from me. > > I'm not a fan of using indirect buffers like this, but if you like the > feature, and the patch works well for you, please go ahead. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dmitry Gutov writes: > No objections from me. > > I'm not a fan of using indirect buffers like this, but if you like the > feature, and the patch works well for you, please go ahead. OK; pushed to Emacs 28 now. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 05 02:51:11 2020 Received: (at control) by debbugs.gnu.org; 5 Oct 2020 06:51:11 +0000 Received: from localhost ([127.0.0.1]:47557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPKL1-00048Z-BQ for submit@debbugs.gnu.org; Mon, 05 Oct 2020 02:51:11 -0400 Received: from quimby.gnus.org ([95.216.78.240]:45430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPKKz-00048N-2E for control@debbugs.gnu.org; Mon, 05 Oct 2020 02:51:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=k18XMtiaC03hbFsjI5CxFiwH7/QnMN9ZtNfbrYVW9ak=; b=JWQ1ymK/tq0s/h9ROTLBYXW5Cy f63grRoAgvl2WYWuvdt42bsxKHxJUTRy5fuX/oaSGxYwttxQiqr6EPUCp1yg5f7Mj3EtAlLjJt2k2 tglsXb7ptkpGkzU8N+r0jnjptkoiv6duBu52siJm4TwtotZyyPZRDsLWFUOxVnrbQFdA=; Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kPKKr-0004aE-7O for control@debbugs.gnu.org; Mon, 05 Oct 2020 08:51:03 +0200 Date: Mon, 05 Oct 2020 08:51:00 +0200 Message-Id: <87wo05qi7f.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #40967 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 40967 fixed close 40967 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 40967 fixed close 40967 28.1 quit From unknown Sun Jun 22 17:14:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#40967: 27.0.50; vc-diff in indirect buffers References: 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 To: 40967@debbugs.gnu.org, Nathan Moreau Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.16027493597048 (code B ref 40967); Thu, 15 Oct 2020 08:10:01 +0000 Received: (at 40967) by debbugs.gnu.org; 15 Oct 2020 08:09:19 +0000 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 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 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) MIME-Version: 1.0 From: Richard Copley Date: Thu, 15 Oct 2020 09:08:45 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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.