aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/mac.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f3cdcbcb00..fb12f26239c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-07-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * mac.c [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Use
4 Fstring_as_unibyte instead of string_make_unibyte.
5
12005-07-15 Richard M. Stallman <rms@gnu.org> 62005-07-15 Richard M. Stallman <rms@gnu.org>
2 7
3 * xdisp.c (select_frame_for_redisplay): Use find_symbol_value. 8 * xdisp.c (select_frame_for_redisplay): Use find_symbol_value.
diff --git a/src/mac.c b/src/mac.c
index 203b47a1975..b4eb2d53dd5 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -4144,7 +4144,7 @@ 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 string = Fstring_as_unibyte (string);
4148 if (src_encoding != kCFStringEncodingInvalidId 4148 if (src_encoding != kCFStringEncodingInvalidId
4149 && tgt_encoding != kCFStringEncodingInvalidId) 4149 && tgt_encoding != kCFStringEncodingInvalidId)
4150 str = CFStringCreateWithBytes (NULL, SDATA (string), SBYTES (string), 4150 str = CFStringCreateWithBytes (NULL, SDATA (string), SBYTES (string),