1 files changed, 4 insertions, 28 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a4bd4d89ef..b06c0961c5 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -3615,7 +3615,7 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate)
         s1 = get_tv_string_buf(rettv, buf1);
         s2 = get_tv_string_buf(&var2, buf2);
         if (type != TYPE_MATCH && type != TYPE_NOMATCH)
-          i = ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2);
+          i = ic ? mb_stricmp(s1, s2) : STRCMP(s1, s2);
         else
           i = 0;
         n1 = FALSE;
@@ -4955,7 +4955,7 @@ tv_equal (
   case VAR_STRING:
     s1 = get_tv_string_buf(tv1, buf1);
     s2 = get_tv_string_buf(tv2, buf2);
-    return (ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2)) == 0;
+    return (ic ? mb_stricmp(s1, s2) : STRCMP(s1, s2)) == 0;
   }
 
   EMSG2(_(e_intern2), "tv_equal()");
@@ -9955,14 +9955,8 @@ static void f_has(typval_T *argvars, typval_T *rettv)
 #endif
     "tag_binary",
     "tag_old_static",
-#ifdef TERMINFO
-    "terminfo",
-#endif
     "termresponse",
     "textobjects",
-#ifdef HAVE_TGETENT
-    "tgetent",
-#endif
     "title",
     "user-commands",        /* was accidentally included in 5.4 */
     "user_commands",
@@ -14424,13 +14418,10 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv)
   if (argvars[2].v_type != VAR_UNKNOWN) {
     mode = get_tv_string_buf(&argvars[2], modebuf);
     modec = TOLOWER_ASC(mode[0]);
-    if (modec != 't' && modec != 'c' && modec != 'g')
+    if (modec != 'c' && modec != 'g')
       modec = 0;        /* replace invalid with current */
   } else {
-    if (abstract_ui || t_colors > 1)
-      modec = 'c';
-    else
-      modec = 't';
+    modec = 'c';
   }
 
 
@@ -18080,21 +18071,6 @@ static int function_exists(char_u *name)
   return n;
 }
 
-char_u *get_expanded_name(char_u *name, int check)
-{
-  char_u      *nm = name;
-  char_u      *p;
-
-  p = trans_function_name(&nm, FALSE, TFN_INT|TFN_QUIET, NULL);
-
-  if (p != NULL && *nm == NUL)
-    if (!check || translated_function_exists(p))
-      return p;
-
-  free(p);
-  return NULL;
-}
-
 /// Return TRUE if "name" looks like a builtin function name: starts with a
 /// lower case letter and doesn't contain AUTOLOAD_CHAR.
 /// "len" is the length of "name", or -1 for NUL terminated.