[ jEdit-commits ] SF.net SVN: jedit:[21640] plugins/Highlight/trunk

[<kp...@us...>]

Revision: 21640
          http://jedit.svn.sourceforge.net/jedit/?rev=21640&view=rev
Author:   kpouer
Date:     2012-05-07 13:21:47 +0000 (Mon, 07 May 2012)
Log Message:
-----------
The plugin will no longer switch to defer mode (#3522011)

Modified Paths:
--------------
    plugins/Highlight/trunk/docs/Highlight.html
    plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java

Added Paths:
-----------
    plugins/Highlight/trunk/CHANGES.txt

Added: plugins/Highlight/trunk/CHANGES.txt
===================================================================
--- plugins/Highlight/trunk/CHANGES.txt	                        (rev 0)
+++ plugins/Highlight/trunk/CHANGES.txt	2012-05-07 13:21:47 UTC (rev 21640)
@@ -0,0 +1,3 @@
+1.9.10 (not released)
+-Fixed NPE during initialization if highlight overview is disabled (#3509281)
+-The plugin will no longer switch to defer mode (#3522011)
\ No newline at end of file

Modified: plugins/Highlight/trunk/docs/Highlight.html
===================================================================
--- plugins/Highlight/trunk/docs/Highlight.html	2012-05-06 20:33:37 UTC (rev 21639)
+++ plugins/Highlight/trunk/docs/Highlight.html	2012-05-07 13:21:47 UTC (rev 21640)
@@ -45,6 +45,8 @@
 	<li>1.9.10 (Mar 20, 2012)</li>
 	<ul>
 		<li>Fixed NPE during initialization if highlight overview is disabled (#3509281)</li>
+		<li>Fixed color highlight disabled at startup because the plugin was able to switch to defer mode
+		    (#3522011)</li>
 	</ul>
 	<li>1.9.9 (Feb 21, 2012)</li>
 	<ul>

Modified: plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java
===================================================================
--- plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java	2012-05-06 20:33:37 UTC (rev 21639)
+++ plugins/Highlight/trunk/src/gatchan/highlight/HighlightPlugin.java	2012-05-07 13:21:47 UTC (rev 21640)
@@ -89,10 +89,7 @@
 	public void stop()
 	{
 		EditBus.removeFromBus(this);
-		if (highlightManager.countHighlights() == 0 && !highlightManager.isHighlightWordAtCaret())
-			jEdit.setProperty("plugin.gatchan.highlight.HighlightPlugin.activate", "defer");
-		else
-			jEdit.setProperty("plugin.gatchan.highlight.HighlightPlugin.activate", "startup");
+		jEdit.resetProperty("plugin.gatchan.highlight.HighlightPlugin.activate");
 
 		Buffer[] buffers = jEdit.getBuffers();
 		for (int i = 0; i < buffers.length; i++)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.