commit df177f679e950a2ab2ad5fe7d45c1daface004d7
author Bram Moolenaar <Bram@vim.org> Tue Feb 22 08:39:57 2005 +0000
committer Bram Moolenaar <Bram@vim.org> Tue Feb 22 08:39:57 2005 +0000
tree 21c0c50e9144ef873af675daf53b86beb26dd677
parent 6bdcfc08cb9c192972336e28a2a842b7abbb2811

updated for version 7.0051

src/mbyte.c

diff --git a/src/mbyte.c b/src/mbyte.c
index f309255..89b53c2 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2871,12 +2871,16 @@
 # ifdef HAVE_NL_LANGINFO_CODESET
     if ((s = nl_langinfo(CODESET)) == NULL || *s == NUL)
 # endif
-# if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+# ifdef MACOS
+	s = "utf-8";
+# else
+#  if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
 	if ((s = setlocale(LC_CTYPE, NULL)) == NULL || *s == NUL)
-# endif
+#  endif
 	    if ((s = getenv("LC_ALL")) == NULL || *s == NUL)
 		if ((s = getenv("LC_CTYPE")) == NULL || *s == NUL)
 		    s = getenv("LANG");
+# endif
 
     if (s == NULL || *s == NUL)
 	return FAIL;
@@ -5578,6 +5582,7 @@
 # endif
     if (vcp->vc_type == CONV_NONE)
 	return FAIL;
+
     return OK;
 }