master 57eb0db: Avoid making backup files in ediff when `make-backup-files' is nil

[Lars Ingebrigtsen]

branch: master
commit 57eb0db9dc270278db9d51214fae780f020fef6a
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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).
---
 lisp/vc/ediff-util.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index b2b92b1..0cbea2c 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)))
     ))