diff options
| author | YAMAMOTO Mitsuharu | 2005-07-16 07:16:55 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-07-16 07:16:55 +0000 |
| commit | 407289a44d7844cc3d9dff1eda89201ea8afeb25 (patch) | |
| tree | 4d39884bfaebdcd37e330102e3d6b5e3f36e3be7 /src | |
| parent | fceb44d2863736de37b3986fe03a9381190be0a4 (diff) | |
| download | emacs-407289a44d7844cc3d9dff1eda89201ea8afeb25.tar.gz emacs-407289a44d7844cc3d9dff1eda89201ea8afeb25.zip | |
[TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Use
Fstring_as_unibyte instead of string_make_unibyte.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/mac.c | 2 |
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 @@ | |||
| 1 | 2005-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 | |||
| 1 | 2005-07-15 Richard M. Stallman <rms@gnu.org> | 6 | 2005-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. |
| @@ -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), |