From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 8 Jul 2021 13:46:38 +0000 (+0200)
Subject: Avoid making backup files in ediff when `make-backup-files' is nil
X-Git-Tag: emacs-28.0.90~1924
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57eb0db9dc270278db9d51214fae780f020fef6a;p=emacs.git

Avoid making backup files in ediff when `make-backup-files' is nil

* lisp/vc/ediff-util.el (ediff-arrange-autosave-in-merge-jobs):
Don't make backup files when `make-backup-files' is nil (bug#21599).
---

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index b2b92b17e28..0cbea2c28d7 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -563,8 +563,9 @@ to invocation.")
 	    (set-visited-file-name merge-buffer-file))))
     (ediff-with-current-buffer ediff-buffer-C
       (setq buffer-offer-save t) ; ask before killing buffer
-      ;; make sure the contents is auto-saved
-      (auto-save-mode 1))
+      (when make-backup-files
+        ;; make sure the contents is auto-saved
+        (auto-save-mode 1)))
     ))