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.
Jon
--
Jonathan Kulp
http://www.jonathankulp.com
From 2c173c2b6cacb37a7243585fb73ae81168aa40e8 Mon Sep 17 00:00:00 2001
From: Jonathan Kulp <j...@bashtop.(none)>
Date: Fri, 15 May 2009 14:32:09 -0500
Subject: [PATCH] Add .ily extension to filetype.vim, docs/vim support
---
Documentation/de/user/setup.itely | 2 +-
Documentation/es/user/setup.itely | 2 +-
Documentation/fr/user/setup.itely | 2 +-
Documentation/user/setup.itely | 2 +-
vim/filetype.vim | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/de/user/setup.itely b/Documentation/de/user/setup.itely
index b467ad2..b22e2f6 100644
--- a/Documentation/de/user/setup.itely
+++ b/Documentation/de/user/setup.itely
@@ -180,7 +180,7 @@ if exists("did_load_filetypes")
finish
endif
augroup filetypedetect
- au! BufNewFile,BufRead *.ly setf lilypond
+ au! BufNewFile,BufRead *.ly,*.ily setf lilypond
augroup END
@end example
diff --git a/Documentation/es/user/setup.itely b/Documentation/es/user/setup.itely
index a201b8d..c222957 100644
--- a/Documentation/es/user/setup.itely
+++ b/Documentation/es/user/setup.itely
@@ -176,7 +176,7 @@ if exists("did_load_filetypes")
finish
endif
augroup filetypedetect
- au! BufNewFile,BufRead *.ly setf lilypond
+ au! BufNewFile,BufRead *.ly,*.ily setf lilypond
augroup END
@end example
diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely
index 3927176..b82585b 100644
--- a/Documentation/fr/user/setup.itely
+++ b/Documentation/fr/user/setup.itely
@@ -182,7 +182,7 @@ if exists("did_load_filetypes")
finish
endif
augroup filetypedetect
- au! BufNewFile,BufRead *.ly setf lilypond
+ au! BufNewFile,BufRead *.ly,*.ily setf lilypond
augroup END
@end example
diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index d91d35c..da5bbe9 100644
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -173,7 +173,7 @@ if exists("did_load_filetypes")
finish
endif
augroup filetypedetect
- au! BufNewFile,BufRead *.ly setf lilypond
+ au! BufNewFile,BufRead *.ly,*.ily setf lilypond
augroup END
@end example
diff --git a/vim/filetype.vim b/vim/filetype.vim
index f80e26f..972cc63 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -6,5 +6,5 @@ if exists("did_load_filetypes")
finish
endif
augroup filetypedetect
- au! BufNewFile,BufRead *.ly setf lilypond
+ au! BufNewFile,BufRead *.ly,*.ily setf lilypond
augroup END
--
1.6.0.4
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
