summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-12-09 13:50:06 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2020-12-09 14:52:53 +0100
commitc9c8d98446f7cd4c9e0eb7394c7f9039965932c7 (patch)
tree151fda6050a579adeac6b46da99f1779c95f840e
parent2782d1e1a1d8945f0efe54091035f1a967f63f44 (diff)
downloademacs-c9c8d98446f7cd4c9e0eb7394c7f9039965932c7.tar.gz
Make ediff offer to create files it's inferring
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Offer to create the inferred file name (if it doesn't exist) (bug#8009). This allows applying a patch that creates a file.
-rw-r--r--lisp/vc/ediff-ptch.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 08640fcece9..580d48880bd 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -465,6 +465,9 @@ are two possible targets for this %spatch. However, these files do not exist."
file1 file2 (if multi-patch-p "multi-" ""))))
(princ "
\nPlease enter an alternative patch target ...\n"))
+ (when (and (string= file1 file2)
+ (y-or-n-p (format "Create %s?" file1)))
+ (write-region (point-min) (point-min) file1))
(let ((directory t)
target)
(while directory