Re: [Monotone-devel] Vimdiff 2 and 3-way merge support

[Matthew A. Nicholson]

Well if you do vim, first, it will never get to gvim, so if you wanna write a 
patch to check to see if X is running, go ahead.  That's just not an itch I am 
willing to scratch right now.

Julio M. Merino Vidal wrote:
> On Mon, 2005-02-14 at 16:17 -0600, Matthew A. Nicholson wrote:
>
> > Here is a patch to std_hooks.lua to add vimdiff support for 2 and 3 way merge. 
> > For the merge to work, the user must save all changes in the left-most file in 
> > the vim window. (they will also have to press enter to vim's prompt when it starts)
>
>
> +      elseif program_exists_in_path("gvim") then
> +         cmd = merge2_vim_cmd("gvim", lfile, rfile, outfile)
> +      elseif program_exists_in_path("vim") then
> +         cmd = merge2_vim_cmd("vim", lfile, rfile, outfile)
>
> Is it really a good idea to rely on gvim first?
>
> I have both vim and gvim on my system; but, when running gvim in the
> console, it spits out an annoying warning (no X server found) and you
> have to manually accept it by pressing return.
>
> Maybe the code could check if gvim exists and the DISPLAY variable is
> defined?
>
> Cheers,


--
Matthew A. Nicholson
Digium