diff --git a/src/popupwin.c b/src/popupwin.c
index 0702222..ec7623d 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1917,7 +1917,7 @@
 	    tp = find_tabpage(tabnr);
 	    if (tp == NULL)
 	    {
-		semsg(_("E997: Tabpage not found: %d"), tabnr);
+		semsg(_(e_tabpage_not_found_nr), tabnr);
 		return NULL;
 	    }
 	}
@@ -2525,7 +2525,7 @@
 
     if (wp != NULL && !WIN_IS_POPUP(wp))
     {
-	semsg(_("E993: window %d is not a popup window"), id);
+	semsg(_(e_window_nr_is_not_popup_window), id);
 	return NULL;
     }
     return wp;
@@ -2671,7 +2671,7 @@
     static void
 error_for_popup_window(void)
 {
-    emsg(_("E994: Not allowed in a popup window"));
+    emsg(_(e_not_allowed_in_popup_window));
 }
 
     int
diff --git a/src/usercmd.c b/src/usercmd.c
index d4ed0a4..135752d 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -618,7 +618,7 @@
 	for (i = 0; err[i] != NUL && !VIM_ISWHITE(err[i]); i++)
 	    ;
 	err[i] = NUL;
-	semsg(_("E180: Invalid address type value: %s"), err);
+	semsg(_(e_invalid_address_type_value_str), err);
 	return FAIL;
     }
 
diff --git a/src/version.c b/src/version.c
index 4a72d01..68c194b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4022,
+/**/
     4021,
 /**/
     4020,