summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/terminal.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 7fbff4617..9ff498f73 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -4341,13 +4341,13 @@ sync_shell_dir(VTermStringFragment *frag)
char_u *new_dir;
// remove HOSTNAME to get PWD
- while (*pos != '/' && offset < frag->len)
+ while (*pos != '/' && offset < (int)frag->len)
{
offset += 1;
pos += 1;
}
- if (offset >= frag->len)
+ if (offset >= (int)frag->len)
{
semsg(_(e_failed_to_extract_pwd_from_str_check_your_shell_config),
frag->str);
diff --git a/src/version.c b/src/version.c
index 68f05af9f..e8827c460 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2845,
+/**/
2844,
/**/
2843,