diff -r 57506cdfb7b4 -r 1e09e143438c langtools/src/share/classes/com/sun/tools/javac/util/Log.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Oct 09 16:07:38 2008 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Oct 09 16:19:13 2008 +0100
@@ -120,7 +120,7 @@
 
         boolean rawDiagnostics = options.get("rawDiagnostics") != null;
         messages = JavacMessages.instance(context);
-        this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(messages) :
+        this.diagFormatter = rawDiagnostics ? new RawDiagnosticFormatter(options) :
                                               new BasicDiagnosticFormatter(options, messages);
         @SuppressWarnings("unchecked") // FIXME
         DiagnosticListener<? super JavaFileObject> diagListener =
@@ -340,14 +340,6 @@
         PrintWriter writer = getWriterForDiagnosticType(diag.getType());
 
         printLines(writer, diagFormatter.format(diag, messages.getCurrentLocale()));
-        if (diagFormatter.displaySource(diag)) {
-            int pos = diag.getIntPosition();
-            if (pos != Position.NOPOS) {
-                JavaFileObject prev = useSource(diag.getSource());
-                printErrLine(pos, writer);
-                useSource(prev);
-            }
-        }
 
         if (promptOnError) {
             switch (diag.getType()) {