bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting

bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting

[Glenn Morris]

This low-effort bug report was sent from an invalid address to help-debbugs.
Resending so it appears on bug-gnu-emacs.

saurabh@sim16.i-did-not-set--mail-host-address--so-tickle-me wrote:

> When a merge is abandoned, a #file# (autosave style) file is saved. This
> is despite a (setq make-backup-files nil).

bug#21599: Autosave seems to be forced during merge

[Saurabh T]

It appears the highlighted (secondlast) line below in ediff-util.el may be forcing the autosave. Can someone confirm?

Is there any way to override this? I abandon merges all the time and do not want these files lying around. Note that I do have
(setq make-backup-files nil)
in .emacs.

Thank you.
saurabh

;; This executes in control buffer and sets auto-save, visited file name, etc,
;; in the merge buffer
(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
  (if (not ediff-merge-job)
      ()
    (if (stringp merge-buffer-file)
	(setq ediff-autostore-merges t
	      ediff-merge-store-file merge-buffer-file))
    (if (stringp ediff-merge-store-file)
	(progn
	  ;; save before leaving ctl buffer
	  (ediff-verify-file-merge-buffer ediff-merge-store-file)
	  (setq merge-buffer-file ediff-merge-store-file)
	  (ediff-with-current-buffer ediff-buffer-C
	    (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)) <===
    ))
 		 	   		  

bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting

[Lars Ingebrigtsen]

saurabh@sim16.i-did-not-set--mail-host-address--so-tickle-me writes:

> When a merge is abandoned, a #file# (autosave style) file is saved. This
> is despite a (setq make-backup-files nil).

This should now be fixed in Emacs 28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no