summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/optionstr.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/optionstr.c b/src/optionstr.c
index 1329be31a..1665509df 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1562,7 +1562,7 @@ did_set_showbreak(char_u **varp)
* The 'guifont' option is changed.
*/
static char *
-did_set_guifont(char_u *oldval, int *redraw_gui_only)
+did_set_guifont(char_u *oldval UNUSED, int *redraw_gui_only)
{
char_u *p;
char *errmsg = NULL;
diff --git a/src/version.c b/src/version.c
index 7e93b11da..5436c99fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1264,
+/**/
1263,
/**/
1262,