change <TAB> to <C-F> (default).

diff --git a/ChangeLog b/ChangeLog
index 1e9d507928618e525a0a004f4c90c0ba044d96da..9d5f84c792a8ebadd38b284df204cae41652afdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-03-12  Heikki Junes <hjunes@cc.hut.fi>
 
-       * vim/lilypond-indent.vim: use <TAB> is indent character in
-       insert-mode. add indenting rules.
+       * vim/lilypond-indent.vim: use <C-F> (default) as indent key
+       in insert-mode. add indenting rules.
 
 2004-03-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/vim/lilypond-indent.vim b/vim/lilypond-indent.vim
index 1f6c681e3bf1c6e28f8db2da10551a047ab65401..ea2523a1355593185f94427d3a883c26e01a1f26 100644 (file)
--- a/vim/lilypond-indent.vim
+++ b/vim/lilypond-indent.vim
@@ -10,7 +10,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetLilyPondIndent()
-setlocal indentkeys+==},>>,!<TAB>
+setlocal indentkeys+==},>>,!^F
 
 " Only define the function once.
 if exists("*GetLilyPondIndent")
@@ -24,15 +24,15 @@ function GetLilyPondIndent()
 
   "Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
-  "Check if a block was started: '{' or '<<' is the last non-blank character of the line.
+  "Check if a block was started: '{' or '<<' is the last non-blank character of the previous line.
   if getline(lnum) =~ '^.*\({\|<<\)\s*$'
     let ind = indent(lnum) + &sw
   else
     let ind = indent(lnum)
   endif
 
-  "Check if a block was ended: '}' or '>>' is the first non-blank character of the line.
-  if getline(v:lnum) =~ '^\s*\(}\|>>\)'
+  "Check if a block was ended: '}' or '>>' is the first non-blank character of the current line.
+  elseif getline(v:lnum) =~ '^\s*\(}\|>>\)'
     let ind = ind - &sw
   endif