From 8add3d80cb22052778e10118551a512ae07c4faf Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 12 Apr 2002 08:17:35 +0000
Subject: [PATCH] Updates for MacOS X and emacs mode.

---
 ChangeLog                          |  3 ++
 Documentation/topdocs/INSTALL.texi | 45 +++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c356df5726..de0b82e50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-04-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* Documentation/topdocs/INSTALL.texi: Updates for MacOS X and
+	emacs mode.
+
 	* Documentation/windows/installing.texi: Suggest gswin32c (console
 	program) for getting the version.  Layout fixes.
 
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 6349d6ddc8..26ff4234d6 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -295,22 +295,25 @@ and for the profiling version, I specify a different configuration.
 @section Emacs mode
 
 An Emacs mode for entering music and running LilyPond is included with
-the source archive as @file{lilypond-mode.el} and
-@file{lilypond-font-lock.el}.  You should install these files somewhere
-in your @var{load-path}.  If you have installed a precompiled LilyPond
-package, these files can be found in
-@file{/usr/share/doc/lilypond-x.y.z/}.
+the source archive as @file{lilypond-mode.el},
+@file{lilypond-indent.el} and @file{lilypond-font-lock.el}.  You
+should install these files somewhere in your @var{load-path}.  If you
+have installed a precompiled LilyPond package, these files can be
+found in @file{/usr/share/doc/lilypond-x.y.z/}.
 
 Add this to your @file{~/.emacs} or @file{~/.emacs.el}, or install this
 file in Emacs' @file{site-start.d}:
+@quotation
 @example
-    ;;; lilypond-init.el --- Startup code for LilyPond mode
+  ;;; lilypond-init.el --- Startup code for LilyPond mode
+
+  (autoload 'LilyPond-mode "lilypond-mode")
+  (setq auto-mode-alist
+        (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
 
-    (load-library "lilypond-mode.el")
-    (setq auto-mode-alist
-      (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
-    (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))
+  (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))
 @end example
+@end quotation
 
 If you have the latest LilyPond-1.4.x Debian package, LilyPond-mode is
 automatically loaded, you not even need to modify your @code{~/.emacs}
@@ -519,6 +522,28 @@ interfere with your build, you may want to do this before the build too:
 
 @subsection MacOS X
 
+LilyPond is available through fink, in the unstable cvs distribution.
+
+You need to:
+@itemize @bullet
+@item Get the Fink package manager from @uref{http://fink.sourceforge.net}
+@item Get the Lilypond package description by enabling the "unstable" tree
+in fink and executing @command{fink selfupdate-cvs}.
+@end itemize
+
+Then do:
+@quotation
+@example
+	fink install lilypond-unstable
+@end example
+@end quotation
+
+That's it!  The command should compile and install all LilyPond
+prerequisites (python, TeX, X11, ghostscript) and then LilyPond
+itself.
+
+
+@subsubsection compiling on MacOS X
 LilyPond has been built on Darwin, to be precise, on:
 @example
     Darwin buoux.aspiratie.nl 5.3 Darwin Kernel Version 5.3: Thu Jan 24
-- 
2.39.5