* 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.

3 files changed, 20 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ed697ce51ee..e5987f7fcc3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-28  Andrew Choi  <akochoi@i-cable.com>
+
+        * 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.
+
 2001-01-28  Kenichi Handa  <handa@etl.go.jp>
 
         * fontset.c (font_family_registry): Even if FONTNAME conform to
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 ()
   consing_since_gc += sizeof *s;
 
 #ifdef GC_CHECK_STRING_BYTES
-  if (!noninteractive)
+  if (!noninteractive
+#ifdef macintosh
+      && current_sblock
+#endif
+     )
     {
       if (++check_string_bytes_count == 200)
         {
diff --git a/src/frame.c b/src/frame.c
index 6850c92dc27..204eec30830 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1074,7 +1074,13 @@ frame.  The hook is called with one argument FRAME.")
   if (! FRAME_LIVE_P (f))
     return Qnil;
 
-  if (NILP (force) && !other_visible_frames (f))
+  if (NILP (force) && !other_visible_frames (f)
+#ifdef macintosh
+      /* Terminal frame deleted before any other visible frames are
+         created.  */
+      && strcmp (XSTRING (f->name)->data, "F1") != 0
+#endif
+     )
     error ("Attempt to delete the sole visible or iconified frame");
 
 #if 0