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

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

diff --git a/ChangeLog b/ChangeLog
index 253dfb27289001d95ec2a6ac62618dd4891dcf73..ff24acfb9d9d6f9624e8583ac9a902589957a477 100644 (file)
--- 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 615bc3413fe7d5081f9c9ca2f655379a8aa0804b..1ad727d8dec4683feb405b0d8e189921dd7d95bd 100644 (file)
--- 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 4d917bbc67b01b2bdf4cdb0683ffdd186b3179d0..7568025451a9f1648cc174baf7fa270e90f7ab90 100644 (file)
--- 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?)