From e1c4fc29debeee95f1207cb4791f659e6bd70f7f Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sun, 29 Aug 2021 11:29:09 -0500
Subject: [PATCH] Prepare for 1.17.1 release.

---
 CHANGELOG.md         | 5 +++++
 meson.build          | 2 +-
 src/conf/janetconf.h | 4 ++--
 src/core/ev.c        | 2 +-
 src/core/marsh.c     | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1f1cb56e..3fd619a8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.17.1 - 2021-08-29
+- Fix docstring typos
+- Add `make install-jpm-git` to make jpm co-install simpler if using makefile.
+- Fix bugs with starting ev/threads and fiber marshling.
+
 ## 1.17.0 - 2021-08-21
 - Add the `-E` flag for one-liners with the `short-fn` syntax for argument passing.
 - Add support for threaded abstract types. Threaded abstract types can easily be shared between threads.
diff --git a/meson.build b/meson.build
index c4941a998..ebcc33eeb 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 project('janet', 'c',
   default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
-  version : '1.17.0')
+  version : '1.17.1')
 
 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index 8d0d72136..f46ef2453 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -5,9 +5,9 @@
 
 #define JANET_VERSION_MAJOR 1
 #define JANET_VERSION_MINOR 17
-#define JANET_VERSION_PATCH 0
+#define JANET_VERSION_PATCH 1
 #define JANET_VERSION_EXTRA ""
-#define JANET_VERSION "1.17.0"
+#define JANET_VERSION "1.17.1"
 
 /* #define JANET_BUILD "local" */
 
diff --git a/src/core/ev.c b/src/core/ev.c
index 7037c0e8f..47e3a3a01 100644
--- a/src/core/ev.c
+++ b/src/core/ev.c
@@ -2519,7 +2519,7 @@ static JanetEVGenericMessage janet_go_thread_subr(JanetEVGenericMessage args) {
                 tstate.payload
             };
             janet_channel_push((JanetChannel *)supervisor,
-                    janet_wrap_tuple(janet_tuple_n(pair, 2)), 2);
+                               janet_wrap_tuple(janet_tuple_n(pair, 2)), 2);
         } else if (flags & 0x1) {
             /* No wait, just print to stderr */
             janet_eprintf("thread start failure: %v\n", tstate.payload);
diff --git a/src/core/marsh.c b/src/core/marsh.c
index 47eff3016..25c3f7604 100644
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -1267,7 +1267,7 @@ static const uint8_t *unmarshal_one(
             data = unmarshal_one_def(st, data, &def, flags + 1);
             if (def->environments_length != len) {
                 janet_panicf("invalid function - env count does not match def (%d != %d)",
-                        len, def->environments_length);
+                             len, def->environments_length);
             }
             func->def = def;
             for (int32_t i = 0; i < def->environments_length; i++) {