On Sun, May 17, 2009 at 05:04:18PM -0500, Jonathan Kulp wrote: > On Sat, May 16, 2009 at 3:24 AM, Patrick McCarty <pnor...@gmail.com> wrote: > > > 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. > > > > Ok I made a new patch according to these instructions and it's attached. > Trevor's not going to be able to get to this for a while, IIRC, so if > someone else wants to check and push it, that'd be great. Thanks for the > help, Patrick.
Hmm. That's weird. I don't see the changes you made to vim/lilypond-ftdetect.vim reflected in the patch. If you run `git status', does it say that you have nothing to commit? If not, then something might have went astray in the process of amending the commit. -Patrick _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
