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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 21599 in the body.
You can then email your comments to 21599 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: saurabh <at> sim16.i-did-not-set--mail-host-address--so-tickle-me
Subject: 24.3;
 ediff-merge-with-ancestor leaves autosave file on abandon despite
 setting
Date: Thu, 1 Oct 2015 13:06:25 -0400

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

Message #8 received at 21599 <at> debbugs.gnu.org (full text, mbox):

From: Glenn Morris <rgm <at> gnu.org>
To: 21599 <at> debbugs.gnu.org
Subject: Re: bug#21599: 24.3;
 ediff-merge-with-ancestor leaves autosave file on abandon despite
 setting
Date: Thu, 01 Oct 2015 14:00:05 -0400

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

saurabh <at> 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).

Message #11 received at 21599 <at> debbugs.gnu.org (full text, mbox):

From: Saurabh T <saurabh <at> hotmail.com>
To: "21599 <at> debbugs.gnu.org" <21599 <at> debbugs.gnu.org>
Subject: Autosave seems to be forced during merge
Date: Sun, 4 Oct 2015 09:17:42 -0400

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

Message #14 received at 21599 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: saurabh <at> sim16.i-did-not-set--mail-host-address--so-tickle-me
Cc: 21599 <at> debbugs.gnu.org
Subject: Re: bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file
 on abandon despite setting
Date: Thu, 08 Jul 2021 15:47:01 +0200

saurabh <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.