From 099fdde0f073315b7f2700786ae533d23a556348 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 13 Dec 2015 14:45:21 +0100
Subject: [PATCH 1/2] patch 7.4.971 Problem:    The asin() function can't be
 used. Solution:   Sort the function table properly. (Watiko)

---
 src/eval.c    | 4 +++-
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/eval.c b/src/eval.c
index ef0ea5ee2b..2668f3db5b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8073,11 +8073,13 @@ static struct fst
     {"argidx",		0, 0, f_argidx},
     {"arglistid",	0, 2, f_arglistid},
     {"argv",		0, 1, f_argv},
+#ifdef FEAT_FLOAT
+    {"asin",		1, 1, f_asin},	/* WJMc */
+#endif
     {"assert_equal",	2, 3, f_assert_equal},
     {"assert_false",	1, 2, f_assert_false},
     {"assert_true",	1, 2, f_assert_true},
 #ifdef FEAT_FLOAT
-    {"asin",		1, 1, f_asin},	/* WJMc */
     {"atan",		1, 1, f_atan},
     {"atan2",		2, 2, f_atan2},
 #endif
diff --git a/src/version.c b/src/version.c
index 803e139a2e..14365945de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    971,
 /**/
     970,
 /**/

From a98849670674264de699d7ab22ae4b9b32e78f4a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 13 Dec 2015 15:08:56 +0100
Subject: [PATCH 2/2] patch 7.4.972 Problem:    Memory leak when there is an
 error in setting an option. Solution:   Free the saved value (Christian
 Brabandt)

---
 src/option.c  | 5 +++++
 src/version.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/option.c b/src/option.c
index 3f98f47b85..0c38de6896 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4970,7 +4970,12 @@ do_set(arg, opt_flags)
 
 			/* If error detected, print the error message. */
 			if (errmsg != NULL)
+			{
+#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
+			    vim_free(saved_origval);
+#endif
 			    goto skip;
+			}
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
 			if (saved_origval != NULL)
 			{
diff --git a/src/version.c b/src/version.c
index 14365945de..8a4eddaab1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    972,
 /**/
     971,
 /**/