summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/scriptfile.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c
index ce9c15d31..2a8320832 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -114,7 +114,7 @@ estack_pop(void)
* "is_sfile" is TRUE for <sfile> itself.
*/
char_u *
-estack_sfile(int is_sfile)
+estack_sfile(int is_sfile UNUSED)
{
estack_T *entry;
#ifdef FEAT_EVAL
diff --git a/src/version.c b/src/version.c
index c45c15519..58a434a1b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1298,
+/**/
1297,
/**/
1296,