diff --git a/src/undo.c b/src/undo.c
index 259de9a..c2fe819 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -375,6 +375,7 @@
     return ul->ul_line == NULL ? FAIL : OK;
 }
 
+#ifdef FEAT_PROP_POPUP
 /*
  * return TRUE if line "lnum" has text property "flags".
  */
@@ -395,6 +396,7 @@
     }
     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 16dfa27..0adfc26 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    846,
+/**/
     845,
 /**/
     844,