diff options
-rw-r--r-- | src/nvim/hardcopy.c | 2 | ||||
-rw-r--r-- | src/nvim/msgpack_rpc/server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 6e9ad02b3a..0cbbe95572 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -2130,7 +2130,7 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit) } /* Use first encoding matched if no charset matched */ - if (p_mbchar == NULL && p_mbenc_first != NULL) { + if (p_mbenc_first != NULL && p_mbchar == NULL) { p_mbenc = p_mbenc_first; cmap = effective_cmap; } diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c index 8fb2902b0b..5e3fd100da 100644 --- a/src/nvim/msgpack_rpc/server.c +++ b/src/nvim/msgpack_rpc/server.c @@ -238,7 +238,7 @@ void server_stop(char *endpoint) } } - if (i == servers.ga_len) { + if (i >= servers.ga_len) { ELOG("Not listening on %s", addr); return; } |