Merge branch 'trunk' into lsp

4 files changed, 10 insertions, 7 deletions

diff --git a/README.md b/README.md
index ba20002..07b6850 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,7 @@ Then, open windows\_installer\\ted\\ted.sln, and build.
 <tr><td>1.2r2</td> <td>Shift+PgUp/PgDown, many rust-related fixes.</td> <td>2022 Sep 30</td></tr>
 <tr><td>1.3</td> <td>Custom background shader, some bugfixes.</td> <td>2022 Nov 3</td></tr>
 <tr><td>1.3r1</td> <td>Fixed rust, python syntax highlighting.</td> <td>2022 Nov 4</td></tr>
+<tr><td>1.3r2</td> <td>Fixed high CPU usage on some devices.</td> <td>2022 Dec 7</td></tr>
 </table>
 
 ## License
diff --git a/main.c b/main.c
index c388b63..385e73e 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,7 @@
 /* 
 FUTURE FEATURES:
+- configurable max buffer size
+- better undo chaining (dechain on backspace?)
 - regenerate tags for completion too if there are no results
 - config variables
 - bind key to multiple commands
diff --git a/time.c b/time.c
index fdd5278..57ec9dc 100644
--- a/time.c
+++ b/time.c
@@ -56,7 +56,7 @@ static double time_get_seconds(void) {
 }
 
 // sleep for a certain number of nanoseconds
-static void sleep_ns(u64 ns) {
+static void time_sleep_ns(u64 ns) {
 #if __unix__
 	struct timespec rem = {0}, req = {
 		(time_t)(ns / 1000000000),
@@ -73,15 +73,15 @@ static void sleep_ns(u64 ns) {
 
 // sleep for microseconds
 static void time_sleep_us(u64 us) {
-	sleep_ns(us * 1000);
+	time_sleep_ns(us * 1000);
 }
 
 // sleep for milliseconds
 static void time_sleep_ms(u64 ms) {
-	sleep_ns(ms * 1000000);
+	time_sleep_ns(ms * 1000000);
 }
 
 // sleep for seconds
 static void time_sleep_s(u64 s) {
-	sleep_ns(s * 1000000000);
+	time_sleep_ns(s * 1000000000);
 }
diff --git a/windows_installer/ted/ted/ted.vdproj b/windows_installer/ted/ted/ted.vdproj
index f766422..6c990cd 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:{643F10DB-AADF-417E-A2DF-C49766EE90C8}"
-        "PackageCode" = "8:{27119D0D-995C-4445-8A83-9C9D4645DC3A}"
+        "ProductCode" = "8:{2B6331CC-DB09-4CFC-819F-6D8D7707915B}"
+        "PackageCode" = "8:{D84EA5BF-43A5-4D0C-88B6-B5AC0A4704B5}"
         "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:22.11.0417"
+        "ProductVersion" = "8:22.12.0721"
         "Manufacturer" = "8:ted"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"