summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorAndrew Choi <akochoi@shaw.ca>2001-01-28 11:23:07 +0000
committerAndrew Choi <akochoi@shaw.ca>2001-01-28 11:23:07 +0000
commit83a96b4d5479a91a4b53d6a6eb348497bba93179 (patch)
tree7526b98d17d7af14439557d1ed8781a43dd9ae28 /src/frame.c
parent847285704da07e3bf5526b6bd373ba1fe193ec35 (diff)
downloademacs-83a96b4d5479a91a4b53d6a6eb348497bba93179.tar.gz
* 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/frame.c')
-rw-r--r--src/frame.c8
1 files changed, 7 insertions, 1 deletions
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