[ jEdit-commits ] SF.net SVN: jedit: [11204] jEdit/trunk

[<k_s...@us...>]

Revision: 11204
          http://jedit.svn.sourceforge.net/jedit/?rev=11204&view=rev
Author:   k_satoda
Date:     2007-12-07 11:46:49 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
Made a mode from BufferHistory less prioritized than explicit "mode"
value in props for jEdit.openFile() or jEdit.openTemporary(). This gives
a way to force a mode of new buffer as it worked before 4.3pre11.

And by the way, removed an unnecessary instantiation of Mode. The value
of "mode" in props are read as String and used to instantiate a Mode at
Buffer#setMode().

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/org/gjt/sp/jedit/jEdit.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2007-12-07 19:33:07 UTC (rev 11203)
+++ jEdit/trunk/doc/CHANGES.txt	2007-12-07 19:46:49 UTC (rev 11204)
@@ -60,6 +60,10 @@
   update Java without reinstalling jEdit.
   (SF.net bug #1227497 - Kazutoshi Satoda)
 
+- Explicit "mode" value in props for jEdit.openFile() or
+  jEdit.openTemporary() was overwritten by the mode in recent files.
+  (Kazutoshi Satoda)
+
 }}}
 {{{ Miscellaneous
 

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2007-12-07 19:33:07 UTC (rev 11203)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2007-12-07 19:46:49 UTC (rev 11204)
@@ -3965,11 +3965,10 @@
 				props.put(JEditBuffer.ENCODING,entry.encoding);
 		}
 
-		if (entry != null && entry.mode != null)
+		if (entry != null && props.get("mode") == null)
 		{
-			Mode mode = getMode(entry.mode);
-			if (mode != null)
-				props.put("mode", mode);
+			if (entry.mode != null)
+				props.put("mode", entry.mode);
 		}
 	} //}}}
 


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