Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/file_completion
author wenzelm
Mon, 15 Feb 2016 14:55:44 +0100
changeset 62337 d3996d5873dd
parent 61511 d40f906bb13f
permissions -rw-r--r--
proper syntax;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
61511
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     1
 
diff -ru 5.3.0/jEdit/org/gjt/sp/jedit/io/VFSFile.java 5.3.0/jEdit-patched/org/gjt/sp/jedit/io/VFSFile.java
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     2
 
--- 5.3.0/jEdit/org/gjt/sp/jedit/io/VFSFile.java	2015-10-20 19:56:08.000000000 +0200
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     3
 
+++ 5.3.0/jEdit-patched/org/gjt/sp/jedit/io/VFSFile.java	2015-10-23 20:06:27.874803025 +0200
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     4
 
@@ -82,16 +82,7 @@
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     5
 
 			}
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     6
 
 			else if(matchAgainst.regionMatches(true,0,str,0,strLen))
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     7
 
 			{
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     8
 
-				/* Keep the first match with exact length but different case.
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
     9
 
-				 * If the first match is not same length, prefer longest match */
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    10
 
-				if(iPotentialMatch == -1
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    11
 
-						|| (potentialMatchGTStr
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    12
 
-							&& (matchAgainst.length() > potentialMatchLen)))
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    13
 
-				{
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    14
 
-					potentialMatchLen = matchAgainst.length();
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    15
 
-					iPotentialMatch = i;
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    16
 
-					potentialMatchGTStr = potentialMatchLen > strLen;
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    17
 
-				}
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    18
 
+                            return i;
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    19
 
 			}
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    20
 
 		}
d40f906bb13f updated to jedit-5.3.0 and SideKick 1.8;
wenzelm
parents:
diff changeset 
    21
isabelle