diff options
| author | Andrew Choi | 2001-01-28 11:23:07 +0000 |
|---|---|---|
| committer | Andrew Choi | 2001-01-28 11:23:07 +0000 |
| commit | 83a96b4d5479a91a4b53d6a6eb348497bba93179 (patch) | |
| tree | 7526b98d17d7af14439557d1ed8781a43dd9ae28 /src/alloc.c | |
| parent | 847285704da07e3bf5526b6bd373ba1fe193ec35 (diff) | |
| download | emacs-83a96b4d5479a91a4b53d6a6eb348497bba93179.tar.gz emacs-83a96b4d5479a91a4b53d6a6eb348497bba93179.zip | |
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
only if current_sblock has been initialized.
* frame.c (Fdelete_frame) [macintosh]: Allow deletion of initial
terminal frame even if it is the only visible frame.
* src/macfns.c (QCconversion): Replaces QCalgorithm.
* src/macfns.c (image_ascent, lookup_image): Adapt to change of
image margins.
* src/macterm.c (x_produce_image_glyph, x_draw_image_foreground)
(x_draw_image_relief, x_draw_image_foreground_1)
(x_draw_image_glyph_string): Adapt to change of image margins.
* src/macterm.c (mac_to_x_fontname): Change charset name of
Simplify Chinese fonts from gb2312 to gb2312.1980 and Korean fonts
from ksc5601 to ksc5601.1989.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index b516695c0dd..4134d26fbd9 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1322,7 +1322,11 @@ allocate_string () | |||
| 1322 | consing_since_gc += sizeof *s; | 1322 | consing_since_gc += sizeof *s; |
| 1323 | 1323 | ||
| 1324 | #ifdef GC_CHECK_STRING_BYTES | 1324 | #ifdef GC_CHECK_STRING_BYTES |
| 1325 | if (!noninteractive) | 1325 | if (!noninteractive |
| 1326 | #ifdef macintosh | ||
| 1327 | && current_sblock | ||
| 1328 | #endif | ||
| 1329 | ) | ||
| 1326 | { | 1330 | { |
| 1327 | if (++check_string_bytes_count == 200) | 1331 | if (++check_string_bytes_count == 200) |
| 1328 | { | 1332 | { |