diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.cxx | 2 | ||||
| -rwxr-xr-x | src/LexGen.py | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index b75c754ac..56785af78 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2236,6 +2236,8 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s int success = search.Execute(di, startOfLine, endOfLine); if (success) { pos = search.bopat[0]; + // Ensure only whole characters selected + search.eopat[0] = doc->MovePositionOutsideChar(search.eopat[0], 1, false); lenRet = search.eopat[0] - search.bopat[0]; // There can be only one start of a line, so no need to look for last match in line if ((increment == -1) && (s[0] != '^')) { diff --git a/src/LexGen.py b/src/LexGen.py index d03c4a24a..233aeeb33 100755 --- a/src/LexGen.py +++ b/src/LexGen.py @@ -261,6 +261,23 @@ def UpdateLineInFile(path, linePrefix, lineReplace): contents = NATIVE.join(lines) + NATIVE UpdateFile(path, contents) +host = "prdownloads.sourceforge.net/" +def UpdateDownloadLinks(path, version): + lines = [] + with open(path, "r") as f: + for l in f.readlines(): + l = l.rstrip() + if host in l: + start, prd, rest = l.partition(host) + pth, dot, ending = rest.partition(".") + pthNew = pth[:-3] + version.rstrip() + lineWithNewVersion = start + prd +pthNew + dot + ending + lines.append(lineWithNewVersion) + else: + lines.append(l) + contents = NATIVE.join(lines) + NATIVE + UpdateFile(path, contents) + def UpdateVersionNumbers(root): with open(root + "scintilla/version.txt") as f: version = f.read() @@ -279,6 +296,7 @@ def UpdateVersionNumbers(root): "VERSION = " + versionDotted) UpdateLineInFile(root + "scintilla/doc/ScintillaDownload.html", " Release", " Release " + versionDotted) + UpdateDownloadLinks(root + "scintilla/doc/ScintillaDownload.html", version) UpdateLineInFile(root + "scintilla/doc/index.html", ' <font color="#FFCC99" size="3"> Release version', ' <font color="#FFCC99" size="3"> Release version ' + versionDotted + '<br />') @@ -290,6 +308,7 @@ def UpdateVersionNumbers(root): "#define VERSION_WORDS " + versionCommad) UpdateLineInFile(root + "scite/doc/SciTEDownload.html", " Release", " Release " + versionDotted) + UpdateDownloadLinks(root + "scite/doc/SciTEDownload.html", version) UpdateLineInFile(root + "scite/doc/SciTE.html", ' <font color="#FFCC99" size="3"> Release version', ' <font color="#FFCC99" size="3"> Release version ' + versionDotted + '<br />') |