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

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

Revision: 12026
          http://jedit.svn.sourceforge.net/jedit/?rev=12026&view=rev
Author:   kpouer
Date:     2008-02-26 12:47:52 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
untitled buffer were not closed with 2 views (#1869978)

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	2008-02-26 20:28:53 UTC (rev 12025)
+++ jEdit/trunk/doc/CHANGES.txt	2008-02-26 20:47:52 UTC (rev 12026)
@@ -43,8 +43,10 @@
 - Fixed a bug where screens were shown off-screen because of a typo in
   GUIUtilities.adjustForScreenBounds() (Bj\xF6rn "Vampire" Kautler)
 
-- The in replace dialog, the replace string can now use capturing groups above 9
+- In the replace dialog, the replace string can now use capturing groups above 9
   (#1834620) (Matthieu Casanova)
+  
+- untitled buffer were not closed with 2 views (#1869978) (Matthieu Casanova)
 }}}
 {{{ Miscellaneous
 

Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2008-02-26 20:28:53 UTC (rev 12025)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java	2008-02-26 20:47:52 UTC (rev 12026)
@@ -39,7 +39,6 @@
 import java.net.*;
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.List;
 
 import org.xml.sax.SAXParseException;
 
@@ -49,8 +48,6 @@
 import org.gjt.sp.jedit.buffer.FoldHandler;
 import org.gjt.sp.jedit.msg.*;
 import org.gjt.sp.jedit.gui.*;
-import org.gjt.sp.jedit.gui.InputHandler;
-import org.gjt.sp.jedit.gui.DefaultInputHandler;
 import org.gjt.sp.jedit.help.HelpViewer;
 import org.gjt.sp.jedit.io.*;
 import org.gjt.sp.jedit.pluginmgr.PluginManager;
@@ -3733,7 +3730,7 @@
 
 			// if only one, clean, 'untitled' buffer is open, we
 			// replace it
-			if(viewCount <= 1 && buffersFirst != null
+			if(buffersFirst != null
 				&& buffersFirst == buffersLast
 				&& buffersFirst.isUntitled()
 				&& !buffersFirst.isDirty())


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