On Sat, May 16, 2009 at 12:03:34AM -0500, Jonathan Kulp wrote:
> Patrick McCarty wrote:
>> On Fri, May 15, 2009 at 02:39:26PM -0500, Jonathan Kulp wrote:
>>> Here's a patch to add the .ily extension to the filetype.vim file in the
>>> sources and to the Application Usage 2.2.2 "Vim mode" sample filetype.vim.
>>
>> You should also add the *.ily to vim/lilypond-ftdetect.vim, because
>> vim/filetype.vim doesn't get distributed.  Maybe it used to, but after
>> a fresh `make install', I can't find filetype.vim in my installation
>> directory.
>>
> I think you're right. I don't see filetype.vim anywhere except the  
> source tree and in my ~/.vim/ directory, the latter of which I put there  
> myself.  It looks like for a regular installation, the contents of  
> lilypond-ftdetect.vim get put into
>   /usr/local/lilypond/usr/share/lilypond/current/vim/ftdetect/lilypond.vim

That's correct.  At one point, I had filetype.vim in my ~/.vim
directory too, but since ftdetect/lilypond.vim does (basically) the
same thing, I've just been using this file.

> I've already made the change to lilypond-ftdetect.vim on my source files  
> but haven't committed or made a patch yet. I want to wait to make sure  
> the first patch applies correctly before making another one.

You are referring to the trailing whitespace issue that Trevor
mentioned, right?

>From my experience making patches with `git format-patch', there is
*always* at least one line with trailing whitespace added.  Your patch
contains five lines with trailing whitespace, yet it applied cleanly
for me using `git am', so I suspect `git format-patch' added those
intentionally.

I can't remember why Trevor has to strip trailing whitespace from
patches, but it might have to do with Git on Windows.

As a side note, you can easily revise your patch with your new
changes.  Just do

$ git add vim/lilypond-ftdetect.vim
$ git commit --amend

and then create a new patch.

> Thanks Patrick,

You're welcome.

-Patrick


_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to