From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#73407: 31.0.50; Add diff-discard-hunk Date: Tue, 24 Sep 2024 09:36:27 +0300 Organization: LINKOV.NET Message-ID: <865xqleexg.fsf@mail.linkov.net> References: <87jzf58g2t.fsf@zephyr.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8348"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu) Cc: 73407@debbugs.gnu.org, dgutov@yandex.ru To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 24 08:55:24 2024 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 1sszSG-0001vg-CB for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Sep 2024 08:55:24 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sszRZ-0008Av-R8; Tue, 24 Sep 2024 02:54:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sszRY-0008AE-6q for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 02:54:40 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sszRX-0000Mq-UI for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 02:54:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=uezGksAIaya1SX+UWZSpt78EL9WbkBPhIS2znw/53/4=; b=U7g0QUtdKHcTG/lIFNv/EiSuxMFg6DNPXwfgXRX7PrljTc/6GS41HpVNLCtxct3J6OW67P0DhPot20fSwWgj+dh4X7EQ/gDfGYfCLStgpZe9sgO8lFQdHAgTDZIg5WHn17UbF5DPuJqbqXj5Jq17jfKA5cnvibaBEfFHwMBARzPElw3snBc812OJQwLRqwE3zpSKEBS2fTmaHc5JioKhNPZeQ1DkUH5s7twNLJ3QedwcRRs8nhL2RxwuAnDCklAPKWeakPOeNfUwGlNosRspwZL1uG7tSYfGc92/ZjYjbI+2Ui0Es+6IYaYdFm2kzAwD2eAVtxYxzi3qBDNKqlGwSw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sszRv-0004nr-TY for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 02:55:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Sep 2024 06:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73407 X-GNU-PR-Package: emacs Original-Received: via spool by 73407-submit@debbugs.gnu.org id=B73407.172716087618356 (code B ref 73407); Tue, 24 Sep 2024 06:55:03 +0000 Original-Received: (at 73407) by debbugs.gnu.org; 24 Sep 2024 06:54:36 +0000 Original-Received: from localhost ([127.0.0.1]:45128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sszRT-0004m0-P3 for submit@debbugs.gnu.org; Tue, 24 Sep 2024 02:54:35 -0400 Original-Received: from relay9-d.mail.gandi.net ([217.70.183.199]:39053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sszRR-0004lQ-VM for 73407@debbugs.gnu.org; Tue, 24 Sep 2024 02:54:34 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 85CF0FF806; Tue, 24 Sep 2024 06:54:01 +0000 (UTC) In-Reply-To: <87jzf58g2t.fsf@zephyr.silentflame.com> (Sean Whitton's message of "Sat, 21 Sep 2024 11:19:06 +0100") X-GND-Sasl: juri@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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:292305 Archived-At: > These patches add a new command, diff-discard-hunk, inspired by some > functionality from Magit. It nicely complements a workflow based around > committing with C-x v v from C-x v D. I have been using it every day > for a year or so, and I think others will find it useful, too. > > Posting for comments. Thanks! It was hard to understand how it's related to C-x v v. But then I realized it saves time to do what currently is done with: 'C-c C-r' (diff-reverse-direction) 'C-c C-a' (diff-apply-hunk) 'k' (diff-hunk-kill). > +(defcustom diff-display-after-apply-hunk t > + "Non-nil means `diff-apply-hunk' will display the buffer it just changed." > + :type 'boolean) > + > @@ -2024,7 +2028,8 @@ diff-apply-hunk > - (set-window-point (display-buffer buf) (+ (car pos) (cdr new))) > + (when diff-display-after-apply-hunk > + (set-window-point (display-buffer buf) (+ (car pos) (cdr new)))) Probably this change is not needed if 'diff-discard-hunk' could avoid using 'diff-apply-hunk', and instead rely on the algorithm from 'diff-apply-buffer'. Also optional region arguments 'beg' and 'end' could be added to 'diff-apply-buffer'.