[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115505: * font.c (font_close_object): Check for liv
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r115505: * font.c (font_close_object): Check for live frame (Bug#16128). |
Date: |
Fri, 13 Dec 2013 13:34:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115505
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-13 17:34:05 +0400
message:
* font.c (font_close_object): Check for live frame (Bug#16128).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/font.c font.c-20091113204419-o5vbwnq5f7feedwu-8540
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-13 03:44:59 +0000
+++ b/src/ChangeLog 2013-12-13 13:34:05 +0000
@@ -1,3 +1,7 @@
+2013-12-13 Dmitry Antipov <address@hidden>
+
+ * font.c (font_close_object): Check for live frame (Bug#16128).
+
2013-12-13 Paul Eggert <address@hidden>
* gnutls.c, gnutls.h (emacs_gnutls_record_check_pending):
=== modified file 'src/font.c'
--- a/src/font.c 2013-12-12 14:26:06 +0000
+++ b/src/font.c 2013-12-13 13:34:05 +0000
@@ -2898,8 +2898,12 @@
font->driver->close (font);
#ifdef HAVE_WINDOW_SYSTEM
eassert (font->frame);
- eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts);
- FRAME_DISPLAY_INFO (font->frame)->n_fonts--;
+ /* If the frame is gone, we can't do anything (Bug#16128). */
+ if (FRAME_LIVE_P (font->frame))
+ {
+ eassert (FRAME_DISPLAY_INFO (font->frame)->n_fonts);
+ FRAME_DISPLAY_INFO (font->frame)->n_fonts--;
+ }
#endif
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115505: * font.c (font_close_object): Check for live frame (Bug#16128).,
Dmitry Antipov <=
- Prev by Date:
[Emacs-diffs] trunk r115504: Make blink-matching-paren perform blinking without moving the cursor
- Next by Date:
[Emacs-diffs] trunk r115506: * alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,
- Previous by thread:
[Emacs-diffs] trunk r115504: Make blink-matching-paren perform blinking without moving the cursor
- Next by thread:
[Emacs-diffs] trunk r115506: * alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,
- Index(es):