diff --git a/src/errors.h b/src/errors.h
index e5f004e..7301b4a 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -549,6 +549,7 @@
 #ifdef FEAT_EVAL
 EXTERN char e_invalid_command_str[]
 	INIT(= N_("E476: Invalid command: %s"));
+#endif
 
 	// E502
 EXTERN char e_is_a_directory[]
@@ -618,6 +619,7 @@
 	INIT(= N_("E676: No matching autocommands for acwrite buffer"));
 EXTERN char e_buffer_nr_invalid_buffer_number[]
 	INIT(= N_("E680: <buffer=%d>: invalid buffer number"));
+#ifdef FEAT_EVAL
 EXTERN char e_cannot_index_a_funcref[]
 	INIT(= N_("E695: Cannot index a Funcref"));
 
@@ -684,9 +686,9 @@
 	INIT(= N_("E948: Job still running"));
 EXTERN char e_job_still_running_add_bang_to_end_the_job[]
 	INIT(= N_("E948: Job still running (add ! to end the job)"));
+#endif
 EXTERN char e_file_changed_while_writing[]
 	INIT(= N_("E949: File changed while writing"));
-#endif
 EXTERN char_u e_invalid_column_number_nr[]
 	INIT(= N_("E964: Invalid column number: %ld"));
 EXTERN char_u e_invalid_line_number_nr[]
diff --git a/src/message.c b/src/message.c
index 36e4548..e738e6d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -826,7 +826,7 @@
     if (!emsg_not_now())
     {
 	emsg_core((char_u *)s);
-#ifdef ABORT_ON_INTERNAL_ERROR
+#if defined(ABORT_ON_INTERNAL_ERROR) && defined(FEAT_EVAL)
 	set_vim_var_string(VV_ERRMSG, (char_u *)s, -1);
 	abort();
 #endif
diff --git a/src/version.c b/src/version.c
index bb73823..8db61c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3963,
+/**/
     3962,
 /**/
     3961,