diff --git a/src/undo.c b/src/undo.c
index 259de9ab2d..c2fe819460 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -375,6 +375,7 @@ u_save_line(undoline_T *ul, linenr_T lnum)
     return ul->ul_line == NULL ? FAIL : OK;
 }
 
+#ifdef FEAT_PROP_POPUP
 /*
  * return TRUE if line "lnum" has text property "flags".
  */
@@ -395,6 +396,7 @@ has_prop_w_flags(linenr_T lnum, int flags)
     }
     return FALSE;
 }
+#endif
 
 /*
  * Common code for various ways to save text before a change.
diff --git a/src/version.c b/src/version.c
index 16dfa277dd..0adfc26606 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    846,
 /**/
     845,
 /**/