From: Heikki Junes <heikki.junes@hut.fi>
Date: Sun, 29 Feb 2004 23:43:14 +0000 (+0000)
Subject: 	* vim/ftplugin/lilypond.vim: change dir for dictionary.
X-Git-Tag: release/2.1.29~39
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=c30d29dd6e8d456dde705e1fa6faebee03570760

	* vim/ftplugin/lilypond.vim: change dir for dictionary.

	* Documentation/topdocs/INSTALL.texi: give easier orders.
---

diff --git a/ChangeLog b/ChangeLog
index 253dfb2728..ff24acfb9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
 	* vimrc: remove file (see next).
 	* vim/ftplugin/lilypond.vim: new, renamed file (see prev).
 
+	* vim/ftplugin/lilypond.vim: change dir for dictionary.
+
+	* Documentation/topdocs/INSTALL.texi: give easier orders.
+
 2004-02-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* stepmake/aclocal.m4: Store computed version in variable.
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 615bc3413f..1ad727d8de 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -16,7 +16,7 @@
 @section Downloading
 
 Even numbered versions are `stable' (2.0, 1.8 etc), while odd version
-are development releases (1.9, 1.7 etc).  Building LilyPond is an
+are development releases (2.1, 1.9, etc).  Building LilyPond is an
 involved process, so if possible, download a precompiled binary from
 @uref{http://www.lilypond.org/,the lilypond site}.
 
@@ -240,23 +240,11 @@ to your @var{load-path}. Append the following line (modified) to your
 
 @c lilypond.words.el for vim auto-completion?
 A Vim mode for entering music and running LilyPond is contained in
-the source archive. Append the content of @file{vimrc} to @file{~/.vimrc}
-to get shortcuts. Install file @file{lilypond.words.el} to @file{~/.vim/} to 
-get auto-completion. Syntax highlighting you get by installing files
-@file{lilypond.vim} and @file{lilypond.words.vim} to @file{~/.vim/syntax/} 
-and appending the following to @file{~/.vim/filetype.vim}:
-@quotation
-@example
-	" my filetype file
-	if exists("did_load_filetypes")
-	  finish
-	endif
-	augroup filetypedetect
-	  au! BufRead,BufNewFile  *.ly          setfiletype lilypond
-	augroup END
-@end example
-@end quotation
-
+the source archive. Copy recursively the file structure in @file{vim/} as 
+your @file{~/.vim/} to get shortcuts. Install (generated) files
+@file{lilypond.words.el} and @file{lilypond.words.vim} to 
+@file{~/.vim/syntax/} in order to get auto-completion and syntax 
+highlighting.
 
 
 @section Problems
diff --git a/vim/ftplugin/lilypond.vim b/vim/ftplugin/lilypond.vim
index 4d917bbc67..7568025451 100644
--- a/vim/ftplugin/lilypond.vim
+++ b/vim/ftplugin/lilypond.vim
@@ -45,7 +45,7 @@ map <F12> :g!/%.*/normal 0i%<Return>
 map <S-F12> :g/%.*/normal 0x<Return>
 "
 " Completions in Insert/Replace-mode with <Ctrl-N>
-set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el
+set dictionary-=~/.vim/syntax/lilypond.words.el dictionary+=~/.vim/syntax/lilypond.words.el
 set complete-=k complete+=k
 " errorformat for lily (with columns) and gcc
 " (how to see multiple-line error messages?)