Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* lisp/vc/ediff-util.el (ediff-arrange-autosave-in-merge-jobs):
Don't make backup files when `make-backup-files' is nil (bug#21599).
This commit is contained in:
Lars Ingebrigtsen 2021-07-08 15:46:38 +02:00
parent de5ae0c964
commit 57eb0db9dc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/ediff-util.el
View file

@ -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)))
))