--- a/src/Pure/System/cygwin.scala Fri May 28 20:41:23 2010 +0200
+++ b/src/Pure/System/cygwin.scala Fri May 28 21:17:59 2010 +0200
@@ -116,7 +116,7 @@
val (_, rc) = Standard_System.raw_exec(root, null, true,
setup_exe.toString, "-R", root.toString, "-l", download.toString,
- "-P", "make,perl,python", "-q", "-n")
+ "-P", "make,perl,python", "-q", "-n")
if (rc != 0) error("Cygwin setup failed!")
sanity_check(root)
--- a/src/Tools/jEdit/src/jedit/isabelle_encoding.scala Fri May 28 20:41:23 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/isabelle_encoding.scala Fri May 28 21:17:59 2010 +0200
@@ -38,16 +38,16 @@
new CharArrayReader(Isabelle.system.symbols.decode(source.mkString).toArray)
}
- override def getTextReader(in: InputStream): Reader =
+ override def getTextReader(in: InputStream): Reader =
text_reader(in, Standard_System.codec())
- override def getPermissiveTextReader(in: InputStream): Reader =
- {
- val codec = Standard_System.codec()
- codec.onMalformedInput(CodingErrorAction.REPLACE)
- codec.onUnmappableCharacter(CodingErrorAction.REPLACE)
- text_reader(in, codec)
- }
+ override def getPermissiveTextReader(in: InputStream): Reader =
+ {
+ val codec = Standard_System.codec()
+ codec.onMalformedInput(CodingErrorAction.REPLACE)
+ codec.onUnmappableCharacter(CodingErrorAction.REPLACE)
+ text_reader(in, codec)
+ }
override def getTextWriter(out: OutputStream): Writer =
{
@@ -60,6 +60,6 @@
}
override def close() { out.close() }
}
- new OutputStreamWriter(buffer, charset.newEncoder())
+ new OutputStreamWriter(buffer, charset.newEncoder())
}
}
--- a/src/Tools/jEdit/src/jedit/isabelle_hyperlinks.scala Fri May 28 20:41:23 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/isabelle_hyperlinks.scala Fri May 28 21:17:59 2010 +0200
@@ -38,8 +38,8 @@
class Isabelle_Hyperlinks extends HyperlinkSource
{
- def getHyperlink(buffer: Buffer, original_offset: Int): Hyperlink =
- {
+ def getHyperlink(buffer: Buffer, original_offset: Int): Hyperlink =
+ {
Document_Model(buffer) match {
case Some(model) =>
val document = model.recent_document()
--- a/src/Tools/jEdit/src/jedit/scala_console.scala Fri May 28 20:41:23 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/scala_console.scala Fri May 28 21:17:59 2010 +0200
@@ -130,17 +130,17 @@
}
override def printPrompt(console: Console, out: Output)
- {
+ {
out.writeAttrs(ConsolePane.colorAttributes(console.getInfoColor), "scala>")
- out.writeAttrs(ConsolePane.colorAttributes(console.getPlainColor), " ")
- }
+ out.writeAttrs(ConsolePane.colorAttributes(console.getPlainColor), " ")
+ }
override def execute(console: Console, input: String, out: Output, err: Output, command: String)
{
val interp = interpreters(console)
with_console(console, out, err) { interp.interpret(command) }
if (err != null) err.commandDone()
- out.commandDone()
+ out.commandDone()
}
override def stop(console: Console)