rename generated file lilypond.words to lilypond.words.el.

diff --git a/ChangeLog b/ChangeLog
index 73b951fe369dcb9b4177436062403702d91ba017..c8539ac8a4e50da2d9321a81a32d4a95b3ef5d85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
        $(builddir).  Stepmake is a normal subdirectory now, that is not
        configured.  Another srcdir build fix.
 
+       * Documentation/topdocs/INSTALL.texi,
+       buildscripts/lilypond.words.py, lilypond-font-lock.el,
+       lilypond-init.el, lilypond-mode.el, debian/rules,
+       make/lilypond.{redhat,madrake,suse}.spec.in, vimrc:
+       rename generated file lilypond.words to lilypond.words.el.
+
 2003-09-20  Heikki Junes  <hjunes@cc.hut.fi>
 
        * ly/chord-modifiers-init.ly, lilypond.vim: updates for vim.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 6fa01b93b9c752dcb1abab458826795b46a61205..d398413aaae3326e07dd1767ded84024eccc8caa 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -265,7 +265,7 @@ and for the profiling version, I specify a different configuration:
 An Emacs mode for entering music and running LilyPond is contained in
 the source archive as @file{lilypond-mode.el},
 @file{lilypond-indent.el}, @file{lilypond-font-lock.el} and
-@file{lilypond.words}.  You should install these files to a directory
+@file{lilypond.words.el}.  You should install these files to a directory
 included in your @var{load-path}. File @file{lilypond-init.el} should
 be placed to @var{load-path}@file{/site-start.d/} or appended to your
 @file{~/.emacs} or @file{~/.emacs.el}.
@@ -284,7 +284,7 @@ to your @var{load-path}. Append the following line (modified) to your
 
 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} to @file{~/.vim/} to 
+to get shortcuts. Install file @file{lilypond.words.el} to @file{~/.vim/} to 
 get auto-completion. Syntax highlighting you get by installing 
 @file{lilypond.vim} to @file{~/.vim/syntax/} and appending the following
 to @file{~/.vim/filetype.vim}:

diff --git a/buildscripts/lilypond.words.py b/buildscripts/lilypond.words.py
index abc33b38017d46ae80068862facf26216a19aa4a..445fff7544ed0b26705ca0921e99b5ee53f37b37 100755 (executable)
--- a/buildscripts/lilypond.words.py
+++ b/buildscripts/lilypond.words.py
@@ -1,7 +1,7 @@
 #!@PYTHON@
 
 # Created 01 September 2003 by Heikki Junes.
-# Makes a lilypond.words file which is used by (X)Emacs and Vim.
+# Generates lilypond.words.el for (X)Emacs and lilypond.words.vim for Vim.
 
 import string
 import re
@@ -125,9 +125,9 @@ for name in [
 
 # the output file
 if sys.argv[1:] == []:
-  out = open('lilypond.words', 'w')
+  out = open('lilypond.words.el', 'w')
 else:
-  out = open(sys.argv[1]+'/lilypond.words', 'w')
+  out = open(sys.argv[1]+'/lilypond.words.el', 'w')
 
 # the menu in lilypond-mode.el
 for line in [

diff --git a/debian/rules b/debian/rules
index 5bee5307edd85bb57c1257dce21417f2f7a1b2ea..972a801590425c5d4a50200d11c8b127c4a1bb40 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \
-               buildscripts/out/lilypond.words \
+               buildscripts/out/lilypond.words.el \
                $(r)/usr/share/emacs/site-lisp/
        dh_installdocs AUTHORS.txt NEWS.txt README.txt \
                DEDICATION THANKS 

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 511db9e3882d306762476e6499fe2598c494793a..7af3b347bc180135c4f03c875f93c40e90d9c0f2 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -5,8 +5,6 @@
 ;; Author: 2001-2003: Heikki Junes
 ;;  * Emacs-mode: new keywords, reserved words, identifiers, notenames, 
 ;;    some dynamics and brackets are font-lock-keywords
-;;  * File lilypond.words contains \keywords, \Identifiers and 
-;;    ReservedWords notenames.
 ;;  * context-dependent syntax-tables
 ;; Author: 1997: Han-Wen Nienhuys
 ;; Author: 1995-1996 Barry A. Warsaw

diff --git a/lilypond-init.el b/lilypond-init.el
index 919b3b5635b88fa54fdaaaf6e1d69adb70672c93..960c886aa5a0cfdb7cc3893aff13bc7fca145796 100644 (file)
--- a/lilypond-init.el
+++ b/lilypond-init.el
@@ -4,7 +4,7 @@
 
 ;; Emacs mode for entering music and running LilyPond is contained in
 ;; the source archive as `lilypond-mode.el', `lilypond-indent.el',
-;; `lilypond-font-lock.el' and `lilypond.words'. You should install 
+;; `lilypond-font-lock.el' and `lilypond.words.el'. You should install 
 ;; these files to a directory included in your `load-path'. 
 ;; File `lilypond-init.el' should be placed to `load-path/site-start.d/' 
 ;; or appended to your `~/.emacs' or `~/.emacs.el'. 

diff --git a/lilypond-mode.el b/lilypond-mode.el
index 8672c1f239e42d2bc529fc2096ad40929174920c..60e4e6ebb1192c25809c427a7527129350ddd05a 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -57,16 +57,16 @@
 
 (defun LilyPond-words-filename ()
   "The file containing LilyPond \keywords \Identifiers and ReservedWords.
-Finds file lilypond-words from load-path."
+Finds file lilypond-words.el from load-path."
   (let ((fn nil)
        (lp load-path)
-       (words-file "lilypond.words"))
+       (words-file "lilypond.words.el"))
     (while (and (> (length lp) 0) (not fn))
       (setq fn (concat (car lp) "/" words-file))
       (if (not (file-readable-p fn)) 
          (progn (setq fn nil) (setq lp (cdr lp)))))
     (if (not fn)
-       (progn (message "Warning: `lilypond.words' not found in `load-path'. See `lilypond-init.el'.")
+       (progn (message "Warning: `lilypond.words.el' not found in `load-path'. See `lilypond-init.el'.")
               (sit-for 5 0)))
     fn))
 
@@ -92,7 +92,7 @@ Finds file lilypond-words from load-path."
   "The last command selected from the LilyPond-Insert -menu.")
 
 (defconst LilyPond-menu-keywords 
-  (let ((wordlist '()) ; add syntax entries to lilypond.words
+  (let ((wordlist '())
        (co (all-completions "" (LilyPond-add-dictionary-word ())))
        (currword ""))
     (progn
@@ -107,7 +107,7 @@ Finds file lilypond-words from load-path."
   "Keywords inserted from LilyPond-Insert-menu.")
 
 (defconst LilyPond-keywords
-  (let ((wordlist '("\\score")) ; add \keywords to lilypond.words
+  (let ((wordlist '("\\score"))
        (co (all-completions "" (LilyPond-add-dictionary-word ())))
        (currword ""))
     (progn
@@ -129,7 +129,7 @@ Finds file lilypond-words from load-path."
   "LilyPond \\keywords")
 
 (defconst LilyPond-identifiers 
-  (let ((wordlist '("\\voiceOne")) ; add \Identifiers to lilypond.words
+  (let ((wordlist '("\\voiceOne"))
        (co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
@@ -147,7 +147,7 @@ Finds file lilypond-words from load-path."
   "LilyPond \\Identifiers")
 
 (defconst LilyPond-Capitalized-Reserved-Words 
-  (let ((wordlist '("Staff")) ; add ReservedWords to lilypond.words
+  (let ((wordlist '("Staff"))
        (co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
@@ -164,7 +164,7 @@ Finds file lilypond-words from load-path."
   "LilyPond ReservedWords")
 
 (defconst LilyPond-non-capitalized-reserved-words
-  (let ((wordlist '("c")) ; add note names lilypond.words
+  (let ((wordlist '("c"))
        (co (all-completions "" (LilyPond-add-dictionary-word ()))))
     (progn
       (while (> (length co) 0)
@@ -847,7 +847,7 @@ command."
     (message "No tag was selected from LilyPond->Insert tag-menu.")))
 
 (defun LilyPond-insert-tag ()
-  "Insert syntax for given tag. The definitions are in lilypond.words."
+  "Insert syntax for given tag. The definitions are in LilyPond-words-filename."
   (interactive)
   (setq b (find-file-noselect (LilyPond-words-filename) t t))
   (let ((word LilyPond-insert-tag-current)

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index fee5ee89f853f4e8f0514135d44c2740e2e54fc7..d300cd5d4239f74c9ee2f488485d1e69a0fb3ded 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -103,7 +103,7 @@ local_lilypond_libdir=$RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 install -m 644 lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
 bzip2 $RPM_BUILD_ROOT%{_mandir}/man1/*

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index a3626a791cf20a268476112993fb67752650459c..7f14e4c389e2706f7f171e5aef67b29ef745833f 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -73,7 +73,7 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/*
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
+install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/
 
 install -m 644 lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d
 

diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in
index 3d0efb998c282ff5ecf3f5f642d7fd452105db7d..0465755d2d4e8e31485e500b8176410908cffe10 100644 (file)
--- a/make/lilypond.suse.spec.in
+++ b/make/lilypond.suse.spec.in
@@ -218,7 +218,7 @@ touch var/adm/SuSEconfig/run-texhash
 %doc lilypond-font-lock.el
 %doc lilypond-indent.el
 %doc lilypond-init.el
-%doc out/lilypond.words
+%doc out/lilypond.words.el
 
 %config /etc/profile.d/*
 

diff --git a/vimrc b/vimrc
index b6093bb8ef5750064baa897462e1011b5f94e841..c37ee866e401764acb87ec26d274400d788773e0 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -38,7 +38,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 dictionary+=~/.vim/lilypond.words
+set dictionary-=~/.vim/lilypond.words.el dictionary+=~/.vim/lilypond.words.el
 set complete-=k complete+=k
 " errorformat for lily (with columns) and gcc
 " (how to see multiple-line error messages?)