Charles Campbell wrote:

> Bram Moolenaar wrote:
> > Patch 7.2.020
> > Problem:    Starting the GUI when the executable starts with 'k', but the 
> > KDE
> >         version no longer exists.
> > Solution:   Don't have "kvim" start the GUI.
> > Files:          src/main.c
> >
> >
> > *** ../vim-7.2.019/src/main.c       Thu Jul 24 19:34:23 2008
> > --- src/main.c      Sun Sep 14 13:26:10 2008
[...]
>
> Looks like there's a conflict between the v:oldfiles patch and #19,20:
> 
> patching file src/ex_cmds.h
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file src/ex_cmds.h.rej
> patching file src/ex_docmd.c
> Hunk #2 FAILED at 2979.
> Hunk #3 succeeded at 9509 (offset 1 line).
> 1 out of 4 hunks FAILED -- saving rejects to file src/ex_docmd.c.rej
> 
> Don't you just love "bit-rot"?  :O

I think this got accidentally included in one of the v:oldfiles
patches.  When it says "assume -R" say "no" and when it says "apply
anyway" say "yes".  Then the duplicated part should fail and the rest
should work.

-- 
>From "know your smileys":
 :~)    A man with a tape recorder up his nose

 /// Bram Moolenaar -- [EMAIL PROTECTED] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---

Raspunde prin e-mail lui