From: <ez...@us...> - 2011-07-28 17:17:44
|
Revision: 19706 http://jedit.svn.sourceforge.net/jedit/?rev=19706&view=rev Author: ezust Date: 2011-07-28 17:17:37 +0000 (Thu, 28 Jul 2011) Log Message: ----------- Rolling back change# 19686. Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/jars/QuickNotepad/users-guide.xml jEdit/trunk/org/gjt/sp/jedit/Mode.java jEdit/trunk/org/gjt/sp/jedit/syntax/ModeProvider.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2011-07-26 17:19:05 UTC (rev 19705) +++ jEdit/trunk/doc/CHANGES.txt 2011-07-28 17:17:37 UTC (rev 19706) @@ -4,7 +4,7 @@ {{{ Version 4.5pre1 -Thanks to Björn "Vampire" Kautler, Matthieu Casanova, Alan Ezust, cy6erGn0m, +Thanks to Björn "Vampire" Kautler, Matthieu Casanova, Alan Ezust, cy6erGn0m, Bad Sector, jclopes, Dale Anson, Anshal Shukla, Ryan Mott, Damien Radtke, Matthew Gilbert, Dennis Hotson, Kevin Hunter, encorejane, nherzing, Evan Wright, Shlomy Reinstein, Marcelo Vanzin and Eric Le Lay for contributing @@ -54,9 +54,6 @@ with some files to open as argument if a jEdit server is running (#3173669 - Matthieu Casanova) -- Fixed mode selection by exact file name match. This is useful for - distinguishing Maven pom.xml files from other xml files. (Dale Anson) - - Fixed wrong mode detection on drag and drop from GNOME Commander. (#3374207 - Shlomy Reinstein) @@ -372,10 +369,10 @@ (Matthieu Casanova) - Update Java installer generated *nix launcher to be the same as the one in - the native *nix packages (Björn "Vampire" Kautler) + the native *nix packages (Björn "Vampire" Kautler) - Add some quotes and explicit variable markers to *nix launcher - (Björn "Vampire" Kautler) + (Björn "Vampire" Kautler) - New property for the edit modes : contextInsensitive. By default the value is false, but if set to true the color highlight of @@ -437,7 +434,7 @@ - Added an option to search for entire words (patch #2842461 from encorejane, Matthieu Casanova) -- Included the Windows launcher in the Java installer (Björn "Vampire" Kautler) +- Included the Windows launcher in the Java installer (Björn "Vampire" Kautler) - Added a new menu item "New Macro" in Macros menu (patch #2983607 from Damien Radtke, Matthieu Casanova) Modified: jEdit/trunk/jars/QuickNotepad/users-guide.xml =================================================================== --- jEdit/trunk/jars/QuickNotepad/users-guide.xml 2011-07-26 17:19:05 UTC (rev 19705) +++ jEdit/trunk/jars/QuickNotepad/users-guide.xml 2011-07-28 17:17:37 UTC (rev 19706) @@ -3,8 +3,7 @@ <!-- Copyright (C) 2001 John Gellene --> <article id="QuickNotepad" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation='http://www.docbook.org/xsd/4.4/docbook.xsd'> -> -<articleinfo> +><articleinfo> <author> <firstname>John</firstname> @@ -33,7 +32,6 @@ the file <filename>COPYING.DOC.txt</filename> included with the jEdit distribution.</para> </legalnotice> - <title>QuickNotepad 4.2</title> </articleinfo> <section> Modified: jEdit/trunk/org/gjt/sp/jedit/Mode.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/Mode.java 2011-07-26 17:19:05 UTC (rev 19705) +++ jEdit/trunk/org/gjt/sp/jedit/Mode.java 2011-07-28 17:17:37 UTC (rev 19706) @@ -232,9 +232,7 @@ */ public boolean accept(String fileName, String firstLine) { - return acceptFilenameIdentical(fileName) - || acceptFilename(fileName) - || acceptFirstLine(firstLine); + return acceptFilename(fileName) || acceptFirstLine(firstLine); } //}}} //{{{ acceptFilename() method Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/ModeProvider.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/syntax/ModeProvider.java 2011-07-26 17:19:05 UTC (rev 19705) +++ jEdit/trunk/org/gjt/sp/jedit/syntax/ModeProvider.java 2011-07-28 17:17:37 UTC (rev 19706) @@ -22,10 +22,6 @@ package org.gjt.sp.jedit.syntax; //{{{ Imports - -import org.gjt.sp.jedit.io.VFS; -import org.gjt.sp.jedit.io.VFSManager; - import org.gjt.sp.jedit.Mode; import org.gjt.sp.util.IOUtilities; import org.gjt.sp.util.Log; @@ -94,11 +90,8 @@ */ public Mode getModeForFile(String filename, String firstLine) { - // get the name of the file minus the path and .gz extension - VFS vfs = VFSManager.getVFSForPath(filename); - filename = vfs.getFileName(filename); - if (filename.endsWith(".gz")) - filename = filename.substring(0, filename.length() - 3); + String nogzName = filename.substring(0,filename.length() - + (filename.endsWith(".gz") ? 3 : 0)); List<Mode> acceptable = new ArrayList<Mode>(); @@ -106,7 +99,7 @@ // User modes have priority. for(Mode mode : overrideModes.values()) { - if(mode.accept(filename, firstLine)) + if(mode.accept(nogzName,firstLine)) { acceptable.add(mode); } @@ -116,7 +109,7 @@ // no user modes were acceptable, so check standard modes. for(Mode mode : modes.values()) { - if(mode.accept(filename, firstLine)) + if(mode.accept(nogzName,firstLine)) { acceptable.add(mode); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |