aboutsummaryrefslogtreecommitdiffstats
path: root/src/mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mac.c')
-rw-r--r--src/mac.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mac.c b/src/mac.c
index 203b47a1975..11dd93aa88d 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -1,5 +1,5 @@
1/* Unix emulation routines for GNU Emacs on the Mac OS. 1/* Unix emulation routines for GNU Emacs on the Mac OS.
2 Copyright (C) 2000, 2001 Free Software Foundation, Inc. 2 Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -4144,7 +4144,11 @@ nil. */)
4144 src_encoding = get_cfstring_encoding_from_lisp (source); 4144 src_encoding = get_cfstring_encoding_from_lisp (source);
4145 tgt_encoding = get_cfstring_encoding_from_lisp (target); 4145 tgt_encoding = get_cfstring_encoding_from_lisp (target);
4146 4146
4147 string = string_make_unibyte (string); 4147 /* We really want string_to_unibyte, but since it doesn't exist yet, we
4148 use string_as_unibyte which works as well, except for the fact that
4149 it's too permissive (it doesn't check that the multibyte string only
4150 contain single-byte chars). */
4151 string = Fstring_as_unibyte (string);
4148 if (src_encoding != kCFStringEncodingInvalidId 4152 if (src_encoding != kCFStringEncodingInvalidId
4149 && tgt_encoding != kCFStringEncodingInvalidId) 4153 && tgt_encoding != kCFStringEncodingInvalidId)
4150 str = CFStringCreateWithBytes (NULL, SDATA (string), SBYTES (string), 4154 str = CFStringCreateWithBytes (NULL, SDATA (string), SBYTES (string),