build(deps): remove msgpack-c dependency

4 files changed, 10 insertions, 12 deletions

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index eeb7e76616..0fe159f594 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -32,7 +32,6 @@ find_package(Iconv REQUIRED)
 find_package(Libuv 1.28.0 REQUIRED)
 find_package(Libvterm 0.3.3 REQUIRED)
 find_package(Lpeg REQUIRED)
-find_package(Msgpack 1.0.0 REQUIRED)
 find_package(Treesitter 0.22.6 REQUIRED)
 find_package(Unibilium 2.0 REQUIRED)
 find_package(UTF8proc REQUIRED)
@@ -41,7 +40,6 @@ target_link_libraries(main_lib INTERFACE
   iconv
   libvterm
   lpeg
-  msgpack
   treesitter
   unibilium
   utf8proc)
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 1ff8716763..afc2efddf6 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -1010,7 +1010,7 @@ static void typval_parse_enter(mpack_parser_t *parser, mpack_node_t *node)
   }
 }
 
-/// free node which was entered but never exited, due to a nested error
+/// Free node which was entered but never exited, due to a nested error
 ///
 /// Don't bother with typvals as these will be GC:d eventually
 void typval_parser_error_free(mpack_parser_t *parser)
@@ -1109,7 +1109,7 @@ msgpack_to_vim_generic_map: {}
   }
 
   default:
-    // other kinds are handled completely in typval_parse_enter,
+    // other kinds are handled completely in typval_parse_enter
     break;
   }
 }
diff --git a/src/nvim/msgpack_rpc/unpacker.c b/src/nvim/msgpack_rpc/unpacker.c
index 9372754b01..efd9a1a11f 100644
--- a/src/nvim/msgpack_rpc/unpacker.c
+++ b/src/nvim/msgpack_rpc/unpacker.c
@@ -525,12 +525,12 @@ bool unpacker_parse_redraw(Unpacker *p)
   }
 }
 
-/// require complete string. safe to use e.g. in shada as we have loaded a complete shada item into
-/// a linear buffer.
+/// Requires a complete string. safe to use e.g. in shada as we have loaded a
+/// complete shada item into a linear buffer.
 ///
-/// data and size are preserved in cause of failure
+/// Data and size are preserved in cause of failure.
 ///
-/// @return "data" is NULL exact when failure (non-null data and size=0 for
+/// @return "data" is NULL only when failure (non-null data and size=0 for
 /// valid empty string)
 String unpack_string(const char **data, size_t *size)
 {
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index e5479a7d40..672ad79579 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -1313,9 +1313,9 @@ static char *shada_filename(const char *file)
   return xstrdup(file);
 }
 
-#define PACK_KEY(s) mpack_str(STATIC_CSTR_AS_STRING(KEY_NAME(s)), &sbuf);
-#define KEY_NAME(s) #s
-#define KEY_NAME2(s) KEY_NAME(s)
+#define KEY_NAME_(s) #s
+#define PACK_KEY(s) mpack_str(STATIC_CSTR_AS_STRING(KEY_NAME_(s)), &sbuf);
+#define KEY_NAME(s) KEY_NAME_(s)
 
 #define SHADA_MPACK_FREE_SPACE (4 * MPACK_ITEM_SIZE)
 
@@ -3301,7 +3301,7 @@ shada_read_next_item_start:
     }
     if (it.rc.size == 0) {
       semsg(_(READERR("register",
-                      "has " KEY_NAME2(REG_KEY_CONTENTS) " key with missing or empty array")),
+                      "has " KEY_NAME(REG_KEY_CONTENTS) " key with missing or empty array")),
             initial_fpos);
       goto shada_read_next_item_error;
     }