From ba337edceb8cb5cc32d1d5cf71437e8d885cf45f Mon Sep 17 00:00:00 2001
From: Leo Tenenbaum <pommicket@gmail.com>
Date: Tue, 20 Apr 2021 19:58:15 -0400
Subject: fix windows build, prepare for v. 1.0

---
 README.md                            | 7 +++++++
 syntax.c                             | 2 +-
 windows_installer/ted/ted/ted.vdproj | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5458f64..05ef18a 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,8 @@ wget https://ftp.pcre.org/pub/pcre/pcre2-10.36.zip
 sudo make install -j4
 ```
 
+You can also run `make ted.deb` to build the .deb installer.
+
 On Windows (64-bit), first you will need to install Microsoft Visual Studio, then find and add vcvarsall.bat to your PATH.
 Next you will need the SDL2 VC development libraries: https://www.libsdl.org/download-2.0.php  
 Extract the zip, copy SDL2-2.x.y into the ted directory, and rename it to SDL2. Also copy SDL2\\lib\\x64\\SDL2.dll
@@ -127,6 +129,10 @@ You will also need PCRE2. Download it here: https://ftp.pcre.org/pub/pcre/pcre2-
 unzip it, and put pcre2-10.36 in the same folder as ted.
 Then run `make.bat release`.
 
+To build the .msi file, you will need Visual Studio, as well as the
+[Visual Studio Installer Projects extension](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects).
+Then, open windows\_installer\\ted\\ted.sln, and build.
+
 ## Version history
 
 <table>
@@ -142,6 +148,7 @@ Then run `make.bat release`.
 <tr><td>0.6</td> <td>Split-screen</td> <td>2021 Feb 28</td></tr>
 <tr><td>0.7</td> <td>Restore session, command selector, :shell, big bug fixes</td> <td>2021 Mar 3</td></tr>
 <tr><td>0.8</td> <td>Autocomplete</td> <td>2021 Mar 4</td></tr>
+<tr><td>1.0</td> <td>Bugfixes, small additional features, installers</td> <td>2021 Apr 20</td></tr>
 </table>
 
 ## License
diff --git a/syntax.c b/syntax.c
index 56dc15f..9903cf4 100644
--- a/syntax.c
+++ b/syntax.c
@@ -903,7 +903,7 @@ static void syntax_highlight_html(SyntaxState *state, char32_t const *line, u32
 		} else if (in_sgl_string || in_dbl_string) {
 			if (char_types)
 				char_types[i] = SYNTAX_STRING;
-			if (line[i] == (in_sgl_string ? '\'' : '"') && backslashes % 2 == 0)
+			if (line[i] == (char32_t)(in_sgl_string ? '\'' : '"') && backslashes % 2 == 0)
 				in_sgl_string = in_dbl_string = false;
 		} else {
 			if (char_types) char_types[i] = SYNTAX_NORMAL;
diff --git a/windows_installer/ted/ted/ted.vdproj b/windows_installer/ted/ted/ted.vdproj
index 960f7dd..95039bc 100644
--- a/windows_installer/ted/ted/ted.vdproj
+++ b/windows_installer/ted/ted/ted.vdproj
@@ -505,15 +505,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ted"
-        "ProductCode" = "8:{C8992411-A410-4770-BBCD-8FE8281C599B}"
-        "PackageCode" = "8:{E11A6787-F72C-47F3-9975-DF24587F89E3}"
+        "ProductCode" = "8:{5686DEA9-F923-4616-B771-D1D3017CCC9B}"
+        "PackageCode" = "8:{A3DA7B8C-FF23-429B-A0C1-ECE1770CAA67}"
         "UpgradeCode" = "8:{844F6C2B-DF3B-4A81-9BD5-603401BBA651}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:21.04.1619"
+        "ProductVersion" = "8:21.04.2019"
         "Manufacturer" = "8:ted"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-- 
cgit v1.2.3