1.1 --- a/Admin/isatest/isatest-makedist	Sat Apr 14 18:28:11 2012 +0200
     1.2 +++ b/Admin/isatest/isatest-makedist	Sat Apr 14 19:09:34 2012 +0200
     1.3 @@ -59,7 +59,7 @@
     1.4  
     1.5  echo "### building distribution"  >> $DISTLOG 2>&1
     1.6  mkdir -p $DISTPREFIX
     1.7 -$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120327" >> $DISTLOG 2>&1
     1.8 +$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120414" >> $DISTLOG 2>&1
     1.9  
    1.10  if [ $? -ne 0 ]
    1.11  then

     2.1 --- a/src/Tools/jEdit/README_BUILD	Sat Apr 14 18:28:11 2012 +0200
     2.2 +++ b/src/Tools/jEdit/README_BUILD	Sat Apr 14 19:09:34 2012 +0200
     2.3 @@ -12,13 +12,13 @@
     2.4    (experimental support for Scala 2.10.x milestones)
     2.5  
     2.6  * Auxiliary jedit_build component
     2.7 -  http://www4.in.tum.de/~wenzelm/test/jedit_build-20120327.tar.gz
     2.8 +  http://www4.in.tum.de/~wenzelm/test/jedit_build-20120414.tar.gz
     2.9  
    2.10  
    2.11  Important settings within Isabelle environment
    2.12  ==============================================
    2.13  
    2.14 -* init_component ".../jedit_build-20120327"
    2.15 +* init_component ".../jedit_build-20120414"
    2.16  * ISABELLE_JDK_HOME
    2.17  * SCALA_HOME
    2.18  

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/Tools/jEdit/patches/jedit-4.5.1/caret	Sat Apr 14 19:09:34 2012 +0200
     3.3 @@ -0,0 +1,12 @@
     3.4 +diff -ru 4.5.1/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 4.5.1/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
     3.5 +--- 4.5.1/jEdit/org/gjt/sp/jedit/textarea/TextArea.java	2012-03-25 18:51:47.000000000 +0200
     3.6 ++++ 4.5.1/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java	2012-04-14 18:37:11.000000000 +0200
     3.7 +@@ -4907,7 +4907,7 @@
     3.8 + 	/**
     3.9 + 	 * Returns true if the caret is visible, false otherwise.
    3.10 + 	 */
    3.11 +-	final boolean isCaretVisible()
    3.12 ++	public final boolean isCaretVisible()
    3.13 + 	{
    3.14 + 		return blink && hasFocus();
    3.15 + 	} //}}}

     4.1 --- a/src/Tools/jEdit/src/text_area_painter.scala	Sat Apr 14 18:28:11 2012 +0200
     4.2 +++ b/src/Tools/jEdit/src/text_area_painter.scala	Sat Apr 14 19:09:34 2012 +0200
     4.3 @@ -220,7 +220,7 @@
     4.4            else chunk_font.getStringBounds(s, font_context).getWidth.toFloat
     4.5  
     4.6          val caret_range =
     4.7 -          if (text_area.hasFocus) doc_view.caret_range()
     4.8 +          if (text_area.isCaretVisible) doc_view.caret_range()
     4.9            else Text.Range(-1)
    4.10  
    4.11          val markup =
    4.12 @@ -373,7 +373,7 @@
    4.13        screen_line: Int, physical_line: Int, start: Int, end: Int, y: Int)
    4.14      {
    4.15        robust_snapshot { _ =>
    4.16 -        if (text_area.hasFocus) {
    4.17 +        if (text_area.isCaretVisible) {
    4.18            val caret = text_area.getCaretPosition
    4.19            if (start <= caret && caret == end - 1) {
    4.20              val painter = text_area.getPainter