# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454857205 -3600
# Node ID d96e38f35e2d436001308279e0be54593faa6a25
# Parent  3e5cb57171f282b5a09898ec81183aff4bce4a99
commit https://github.com/vim/vim/commit/a6f72ba7c6cadd37be38d92008d10a3025fdc5ec
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 7 15:57:00 2016 +0100

    patch 7.4.1277
    Problem:    Compiler can complain about missing enum value in switch with some
                combination of features.
    Solution:   Remove #ifdefs around case statements.

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -19869,9 +19869,7 @@ f_type(typval_T *argvars, typval_T *rett
 	case VAR_FUNC:   n = 2; break;
 	case VAR_LIST:   n = 3; break;
 	case VAR_DICT:   n = 4; break;
-#ifdef FEAT_FLOAT
 	case VAR_FLOAT:  n = 5; break;
-#endif
 	case VAR_SPECIAL:
 	     if (argvars[0].vval.v_number == VVAL_FALSE
 		     || argvars[0].vval.v_number == VVAL_TRUE)
@@ -19879,9 +19877,7 @@ f_type(typval_T *argvars, typval_T *rett
 	     else
 		 n = 7;
 	     break;
-#ifdef FEAT_JOB
 	case VAR_JOB:    n = 8; break;
-#endif
 	case VAR_UNKNOWN:
 	     EMSG2(_(e_intern2), "f_type(UNKNOWN)");
 	     n = -1;
@@ -24904,9 +24900,7 @@ write_viminfo_varlist(FILE *fp)
 		{
 		    case VAR_STRING: s = "STR"; break;
 		    case VAR_NUMBER: s = "NUM"; break;
-#ifdef FEAT_FLOAT
 		    case VAR_FLOAT:  s = "FLO"; break;
-#endif
 		    case VAR_DICT:   s = "DIC"; break;
 		    case VAR_LIST:   s = "LIS"; break;
 		    case VAR_SPECIAL: s = "XPL"; break;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1277,
+/**/
     1276,
 /**/
     1275,