From: Kevin Rodgers <kevin.d.rodgers@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Re: Using emerge on windows? Funky errors with Temp files
Date: Tue, 22 Mar 2011 20:56:56 -0600 [thread overview]
Message-ID: <imbnh7$mac$1@dough.gmane.org> (raw)
In-Reply-To: <8762rb7fel.fsf@fencepost.gnu.org>
On 3/22/11 2:01 AM, David Kastrup wrote:
> Stefan Monnier<monnier@iro.umontreal.ca> writes:
>
>>>>> Note -- I am an emerge newbie, so, um, be gentle..
>>>> BTW, is there a particular reason you use emerge rather than ediff3?
>>>> I thought emerge was only used by old-time users, all new ones
>>>> preferring the snazzier ediff3.
>>> AFAIK, ediff does not have an interface for commandline usage as an
>>> external merge resolution tool.
>>
>> That'd be easy to add, I'm sure.
>
> I once tried for about a week (since i would have liked to have ediff be
> an option for merge resolution in git) and then gave up. ediff is a
> maze of twisty little hooks and indirections, catering without useful
> documentation for everything except that which you'd actually need.
>
> In any case, "that'd be easy to add" is nothing that is going to make
> users switch. The proof is in the pudding.
I have this in my ~/.emacs to run ediff-files. I think you just need to add
file-c in the obvious way to call ediff3 instead:
(defun diff-command-line-args (switch)
"Run `ediff-files' on the following 2 command line arguments (after SWITCH)."
;; (prog1 ...) == (pop command-line-args-left):
(let ((file-a (prog1 (car command-line-args-left)
(setq command-line-args-left
(cdr command-line-args-left))))
(file-b (prog1 (car command-line-args-left)
(setq command-line-args-left
(cdr command-line-args-left)))))
(ediff-files file-a file-b)))
(setq command-switch-alist
(cons '("--diff" . diff-command-line-args) command-switch-alist))
--
Kevin Rodgers
Denver, Colorado, USA
next prev parent reply other threads:[~2011-03-23 2:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailman.14.1300483407.31996.help-gnu-emacs@gnu.org>
2011-03-19 2:02 ` Using emerge on windows? Funky errors with Temp files Stefan Monnier
2011-03-19 8:08 ` David Kastrup
2011-03-22 1:05 ` Stefan Monnier
2011-03-22 8:01 ` David Kastrup
2011-03-23 2:56 ` Kevin Rodgers [this message]
[not found] ` <mailman.2.1300849017.12215.help-gnu-emacs@gnu.org>
2011-03-23 7:23 ` David Kastrup
2011-03-25 3:55 ` Kevin Rodgers
2011-03-18 21:23 fork
2011-03-18 21:31 ` fork
2011-03-18 21:54 ` Eli Zaretskii
2011-03-18 21:36 ` Eli Zaretskii
2011-03-18 21:48 ` Eli Zaretskii
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='imbnh7$mac$1@dough.gmane.org' \
--to=kevin.d.rodgers@gmail.com \
--cc=help-gnu-emacs@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.