From: Sean Whitton <spwhitton@spwhitton.name>
Date: Tue, 11 Mar 2025 11:17:04 +0000 (+0800)
Subject: diff-apply-buffer: Operate on region, add prefix argument
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4c30ae4f8ac9ecb34f20cd279365e07b6129276;p=emacs.git

diff-apply-buffer: Operate on region, add prefix argument

* lisp/vc/diff-mode.el (diff-apply-buffer): Interactively,
operate on an active region.  Reverse-apply hunks with a prefix
argument, like C-u C-c C-a already does.

(cherry picked from commit 942bb22c9f936a5f2f55dcf12748601ec4046deb)
---

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9f45c8eba72..5db61b144b3 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2202,12 +2202,18 @@ customize `diff-ask-before-revert-and-kill-hunk' to control that."
 
 (defun diff-apply-buffer (&optional beg end reverse)
   "Apply the diff in the entire diff buffer.
+Interactively, if the region is active, apply all hunks that the region
+overlaps; otherwise, apply all hunks.
+With a prefix argument, reverse-apply the hunks.
 If applying all hunks succeeds, save the changed buffers.
+
 When called from Lisp with optional arguments, restrict the application
-to hunks lying between BEG and END, and reverse-apply them when REVERSE is
-non-nil.  Returns nil if buffers were successfully modified and saved, or
-the number of failed hunk applications otherwise."
-  (interactive)
+to hunks lying between BEG and END, and reverse-apply them when REVERSE
+is non-nil.  Returns nil if buffers were successfully modified and
+saved, or the number of failed hunk applications otherwise."
+  (interactive (list (use-region-beginning)
+                     (use-region-end)
+                     current-prefix-arg))
   (let ((buffer-edits nil)
         (failures 0)
         (diff-refine nil))