# HG changeset patch
# User wenzelm
# Date 1308080460 -7200
# Node ID 986860aa51ac177232a70621c0e76573c39381ee
# Parent  7ee98a3802af513cc7a01fabe6878949672c54bd
include scala mode;

diff -r 7ee98a3802af -r 986860aa51ac src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Tue Jun 14 17:24:23 2011 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Jun 14 21:41:00 2011 +0200
@@ -224,10 +224,14 @@
   cp -a "${RESOURCES[@]}" dist/classes/.
   cp src/jEdit.props dist/properties/.
   cp -a src/modes/. dist/modes/.
+  cp -a "$SCALA_HOME/misc/scala-tool-support/jedit/modes/scala.xml" dist/modes/.
 
-  perl -i -e 'while (<>) { if (m/NAME="javacc"/) {
-    print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
-    print qq,<MODE NAME="isabelle-session" FILE="isabelle-session.xml" FILE_NAME_GLOB="session.root"/>\n\n,; }
+  perl -i -e 'while (<>) {
+    if (m/NAME="javacc"/) {
+      print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
+      print qq,<MODE NAME="isabelle-session" FILE="isabelle-session.xml" FILE_NAME_GLOB="session.root"/>\n\n,; }
+    elsif (m/NAME="scheme"/) {
+      print qq,<MODE NAME="scala" FILE="scala.xml" FILE_NAME_GLOB="*.scala" />\n\n,; }
     print; }' dist/modes/catalog
 
   cp -a "${JEDIT_JARS[@]}" "${SCALA_JARS[@]}" "$ISABELLE_HOME/lib/classes/Pure.jar" \