From: Heikki Junes Date: Sat, 20 Sep 2003 10:29:58 +0000 (+0000) Subject: rename generated file lilypond.words to lilypond.words.el. X-Git-Tag: release/1.9.9~29 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=95d1198083240c84f01a0ad15b1b06c2d2079cd3;p=lilypond.git rename generated file lilypond.words to lilypond.words.el. --- diff --git a/ChangeLog b/ChangeLog index 73b951fe36..c8539ac8a4 100644 --- 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 * ly/chord-modifiers-init.ly, lilypond.vim: updates for vim. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 6fa01b93b9..d398413aaa 100644 --- 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 abc33b3801..445fff7544 100755 --- 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 5bee5307ed..972a801590 100644 --- 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 511db9e388..7af3b347bc 100644 --- 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 919b3b5635..960c886aa5 100644 --- 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 8672c1f239..60e4e6ebb1 100644 --- 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 fee5ee89f8..d300cd5d42 100644 --- 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 a3626a791c..7f14e4c389 100644 --- 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 3d0efb998c..0465755d2d 100644 --- 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 b6093bb8ef..c37ee866e4 100644 --- a/vimrc +++ b/vimrc @@ -38,7 +38,7 @@ map :g!/%.*/normal 0i% map :g/%.*/normal 0x " " Completions in Insert/Replace-mode with -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?)