From: Saurabh T <saurabh@hotmail.com>
To: "21599@debbugs.gnu.org" <21599@debbugs.gnu.org>
Subject: bug#21599: Autosave seems to be forced during merge
Date: Sun, 4 Oct 2015 09:17:42 -0400 [thread overview]
Message-ID: <DUB123-W32A48E19C6904CC50148BBB1490@phx.gbl> (raw)
In-Reply-To: <201510011706.t91H6P7c029537@sim17.simmetrix.com>
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)) <===
))
next prev parent reply other threads:[~2015-10-04 13:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
2021-07-08 13:47 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DUB123-W32A48E19C6904CC50148BBB1490@phx.gbl \
--to=saurabh@hotmail.com \
--cc=21599@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.