* bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting
[not found] <201510011706.t91H6P7c029537@sim17.simmetrix.com>
@ 2015-10-01 18:00 ` Glenn Morris
2015-10-04 13:17 ` bug#21599: Autosave seems to be forced during merge Saurabh T
2021-07-08 13:47 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Lars Ingebrigtsen
2 siblings, 0 replies; 3+ messages in thread
From: Glenn Morris @ 2015-10-01 18:00 UTC (permalink / raw)
To: 21599
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).
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#21599: Autosave seems to be forced during merge
[not found] <201510011706.t91H6P7c029537@sim17.simmetrix.com>
2015-10-01 18:00 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Glenn Morris
@ 2015-10-04 13:17 ` Saurabh T
2021-07-08 13:47 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Lars Ingebrigtsen
2 siblings, 0 replies; 3+ messages in thread
From: Saurabh T @ 2015-10-04 13:17 UTC (permalink / raw)
To: 21599@debbugs.gnu.org
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)) <===
))
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting
[not found] <201510011706.t91H6P7c029537@sim17.simmetrix.com>
2015-10-01 18:00 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Glenn Morris
2015-10-04 13:17 ` bug#21599: Autosave seems to be forced during merge Saurabh T
@ 2021-07-08 13:47 ` Lars Ingebrigtsen
2 siblings, 0 replies; 3+ messages in thread
From: Lars Ingebrigtsen @ 2021-07-08 13:47 UTC (permalink / raw)
To: saurabh; +Cc: 21599
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-08 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <201510011706.t91H6P7c029537@sim17.simmetrix.com>
2015-10-01 18:00 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Glenn Morris
2015-10-04 13:17 ` bug#21599: Autosave seems to be forced during merge Saurabh T
2021-07-08 13:47 ` bug#21599: 24.3; ediff-merge-with-ancestor leaves autosave file on abandon despite setting Lars Ingebrigtsen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).