From: Noam Postavsky <npostavs@gmail.com>
To: Dave Abrahams <dave@boostpro.com>
Cc: 11320@debbugs.gnu.org
Subject: bug#11320: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor
Date: Thu, 28 Jun 2018 22:13:10 -0400 [thread overview]
Message-ID: <87bmbunxvt.fsf@gmail.com> (raw)
In-Reply-To: <87d0y1ljfr.fsf@gmail.com> (Noam Postavsky's message of "Fri, 11 May 2018 22:03:04 -0400")
tags 11320 fixed
close 11320 27.1
quit
Noam Postavsky <npostavs@gmail.com> writes:
> Would it make sense to ask about ancestor vs merge buffer even before
> the "currently highlighted" query? I don't quite see why those two
> should be tied together. Although with the patch below, it might be too
> many queries, perhaps it's better to only ask when given a prefix arg or
> something.
I changed the order of the queries, so that the user can hit two "y"s in
order. I found this fairly okay. I've pushed to master, we'll see if
someone comes up with something better later.
[1: 591bb3d900]: 2018-06-28 22:09:04 -0400
Let ediff '=' compare against ancestor buffer (Bug#11320)
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=591bb3d90018ebbcf79e6d496ed73ef396a58887
next prev parent reply other threads:[~2018-06-29 2:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 19:28 bug#11318: [Patchset] A bugfix and an arguable bugfix for ediff-inferior-compare-regions Dave Abrahams
2012-04-23 19:28 ` bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Dave Abrahams
2012-12-14 15:23 ` Stefan Monnier
2012-12-14 17:17 ` Dave Abrahams
[not found] ` <e5472cbf85e944178dd2aebb9d6ed40a@HUBCAS1.cs.stonybrook.edu>
2012-12-15 4:46 ` Michael Kifer
2012-12-17 23:22 ` Dave Abrahams
2012-12-17 23:28 ` Michael Kifer
2012-12-17 23:44 ` Dave Abrahams
2012-12-18 0:01 ` Michael Kifer
2012-04-23 19:28 ` bug#11320: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor Dave Abrahams
2018-05-12 2:03 ` Noam Postavsky
2018-06-29 2:13 ` Noam Postavsky [this message]
2012-05-10 1:05 ` bug#11318: [Patchset] A bugfix and an arguable bugfix for ediff-inferior-compare-regions Glenn Morris
2012-05-10 1:40 ` Dave Abrahams
2012-05-10 4:04 ` Stefan Monnier
2012-05-10 4:20 ` Glenn Morris
2012-05-12 17:18 ` Stefan Monnier
2012-07-21 2:30 ` Dave Abrahams
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bmbunxvt.fsf@gmail.com \
--to=npostavs@gmail.com \
--cc=11320@debbugs.gnu.org \
--cc=dave@boostpro.com \
/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 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).