From 4d0504019cc744a5122821f187dd3adfe536afff Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 9 Jan 2017 12:58:11 +0100
Subject: [PATCH 1/3] patch 8.0.0161: can't build with small features

Problem:    Build fails when using small features.
Solution:   Update #ifdef for using save_ccline. (Hirohito Higashi)
---
 src/ex_getln.c | 3 ++-
 src/version.c  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index cf99ae2a83..162e55590a 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -212,7 +212,8 @@ getcmdline(
 #endif
     expand_T	xpc;
     long	*b_im_ptr = NULL;
-#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) || defined(FEAT_SEARCH_EXTRA)
+#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) \
+    || defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CMDWIN)
     /* Everything that may work recursively should save and restore the
      * current command line in save_ccline.  That includes update_screen(), a
      * custom status line may invoke ":normal". */
diff --git a/src/version.c b/src/version.c
index 641c72c40f..7f52cab802 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    161,
 /**/
     160,
 /**/

From 009c7b2640b6e04c101118cc7d0dc5785f9aa116 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 9 Jan 2017 20:30:27 +0100
Subject: [PATCH 2/3] patch 8.0.0162: build error on Fedora 23

Problem:    Build error on Fedora 23 with small features and gnome2.
Solution:   Undefine ngettext(). (Hirohito Higashi)
---
 src/gui_gtk.c     | 3 +++
 src/gui_gtk_x11.c | 3 +++
 src/version.c     | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 8686381b0e..c015d7ee66 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -51,6 +51,9 @@
 # ifdef _
 #  undef _
 # endif
+# ifdef ngettext
+#  undef ngettext
+# endif
 # ifdef N_
 #  undef N_
 # endif
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 514ac9e31a..71bcd6a3a6 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -35,6 +35,9 @@
 # ifdef _
 #  undef _
 # endif
+# ifdef ngettext
+#  undef ngettext
+# endif
 # ifdef N_
 #  undef N_
 # endif
diff --git a/src/version.c b/src/version.c
index 7f52cab802..1c4c57bb9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    162,
 /**/
     161,
 /**/

From 6abda995a57306028c3dc5c62c9b15858e5a3bcf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 9 Jan 2017 21:10:31 +0100
Subject: [PATCH 3/3] patch 8.0.0163: cannot build with Ruby 2.4

Problem:    Ruby 2.4 no longer supports rb_cFixnum.
Solution:   move rb_cFixnum into an #ifdef. (Kazuki Sakamoto, closes #1365)
---
 src/if_ruby.c | 3 ++-
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index fc72d33dd4..bc6edc7536 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -514,9 +514,10 @@ static struct
 {
     {"rb_assoc_new", (RUBY_PROC*)&dll_rb_assoc_new},
     {"rb_cFalseClass", (RUBY_PROC*)&dll_rb_cFalseClass},
-    {"rb_cFixnum", (RUBY_PROC*)&dll_rb_cFixnum},
 # if defined(USE_RUBY_INTEGER)
     {"rb_cInteger", (RUBY_PROC*)&dll_rb_cInteger},
+# else
+    {"rb_cFixnum", (RUBY_PROC*)&dll_rb_cFixnum},
 # endif
 # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20
     {"rb_cFloat", (RUBY_PROC*)&dll_rb_cFloat},
diff --git a/src/version.c b/src/version.c
index 1c4c57bb9b..9b0809bf6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    163,
 /**/
     162,
 /**/