diff options
| author | Heikki Junes <heikki.junes@hut.fi> | 2004-03-22 22:21:55 +0000 |
|---|---|---|
| committer | Heikki Junes <heikki.junes@hut.fi> | 2004-03-22 22:21:55 +0000 |
| commit | d59c519d8248e9c337f9020e98242e2afbfcb3e8 (patch) | |
| tree | 93fde87332fec51b1dcbebc7c0b42d05b7aed874 /elisp | |
| parent | 4127e2952126d6084d59d7c00dae5bfb1bfbbf8e (diff) | |
* buildscripts/lilypond.words.py: remove.
* buildscripts/lilypond-words.py: add new, renamed file.
Give generated targets and dirs explicitly in arguments.
* GNUmakefile.in, elisp/GNUmakefile, elisp/lilypond-init.el,
elisp/lilypond-mode.el, vim/lilypond-ftplugin.vim,
vim/lilypond-syntax.vim: update to use new lilypond-words.py.
* config.make.in: give '/usr/share/vim' explicitly as $(vimdir).
* vim/GNUmake use --words and --vim targets in lilypond-words.py
Diffstat (limited to 'elisp')
| -rw-r--r-- | elisp/GNUmakefile | 8 | ||||
| -rw-r--r-- | elisp/lilypond-init.el | 2 | ||||
| -rw-r--r-- | elisp/lilypond-mode.el | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile index 09e23a203d..b68847804c 100644 --- a/elisp/GNUmakefile +++ b/elisp/GNUmakefile @@ -6,20 +6,20 @@ INSTALLATION_DIR=$(elispdir) INSTALLATION_FILES=$(EL_FILES) INSTALLATION_OUT_DIR=$(elispdir) -INSTALLATION_OUT_FILES=$(outdir)/lilypond.words.el +INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el STEPMAKE_TEMPLATES=elisp install install-out include $(depth)/make/stepmake.make -LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim +LILYPOND_WORDS = $(outdir)/lilypond-words.el LILYPOND_WORDS_DEPENDS =\ $(topdir)/lily/my-lily-lexer.cc \ - $(buildscript-dir)/lilypond.words.py \ + $(buildscript-dir)/lilypond-words.py \ $(topdir)/scm/new-markup.scm \ $(topdir)/ly/engraver-init.ly $(LILYPOND_WORDS): - cd $(topdir) && $(PYTHON) buildscripts/lilypond.words.py $(builddir)/elisp/$(outconfbase) + cd $(topdir) && $(PYTHON) buildscripts/lilypond-words.py --el --dir=$(builddir)/elisp/$(outconfbase) all: $(LILYPOND_WORDS) diff --git a/elisp/lilypond-init.el b/elisp/lilypond-init.el index 960c886aa5..be841c2654 100644 --- a/elisp/lilypond-init.el +++ b/elisp/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.el'. 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/elisp/lilypond-mode.el b/elisp/lilypond-mode.el index fb53bb0358..0087f59636 100644 --- a/elisp/lilypond-mode.el +++ b/elisp/lilypond-mode.el @@ -60,13 +60,13 @@ Finds file lilypond-words.el from load-path." (let ((fn nil) (lp load-path) - (words-file "lilypond.words.el")) + (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.el' 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)) |