From: Jerome Marant <jerome@debian.org>
Date: Sat, 3 Sep 2005 09:45:27 +0000 (+0000)
Subject: Add ocaml-mode.README.Debian file explaining how to override tuareg-mode
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~732
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c3649703cd720be025721330e5447dd393622f96;p=ocaml.git

Add ocaml-mode.README.Debian file explaining how to override tuareg-mode
---

diff --git a/debian/changelog b/debian/changelog
index 06ab0036..17ad7022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ ocaml (3.08.3-8) UNRELEASED; urgency=low
       package
     - Mention that all previous emacs conffiles are renamed in order
       not to mess with the new ocaml-mode
+  * debian/ocaml-mode.README.Debian:
+    - New file
+    - Explain how to override tuareg-mode in case both modes are
+      installed
 
   * debian/changelog: Remove spurious changelog entry
 
diff --git a/debian/ocaml-mode.README.Debian b/debian/ocaml-mode.README.Debian
new file mode 100644
index 00000000..3dd76634
--- /dev/null
+++ b/debian/ocaml-mode.README.Debian
@@ -0,0 +1,14 @@
+ocaml-mode for Debian
+---------------------
+
+ WARNING: tuareg-mode may be installed on your system. Since it
+ has a higher priority than ocaml-mode, it will be used for
+ every OCaml file loaded into (X)Emacs.
+ 
+ If you absolutely want to override those default settings and
+ use ocaml-mode instead of tuareg-mode, you only need to add the
+ following line to your .emacs:
+
+   (load-file "/etc/emacs/site-start.d/50ocaml-mode.el")
+
+ -- Jerome Marant <jerome@debian.org>, Sat Sep  3 11:41:37 2005