summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nsfns.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 8804a7df7cf..5ae2cc77bb2 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3829,7 +3829,9 @@ all_nonzero_ascii (unsigned char *str, ptrdiff_t n)
/* Make a Lisp string from an NSString. */
- (Lisp_Object)lispString
{
- return build_string ([self UTF8String]);
+ // make_string behaves predictably and correctly with UTF-8 input.
+ return make_string ([self UTF8String],
+ [self lengthOfBytesUsingEncoding: NSUTF8StringEncoding]);
}
@end