diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-11-03 23:56:32 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-11-03 23:56:32 +0200 |
| commit | 2a58bbc1830abaf7b51cb9d94df884dc92071ddf (patch) | |
| tree | e337ec99861e92b458cf90477430138961e44591 | |
| parent | 14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff) | |
| download | emacs-2a58bbc1830abaf7b51cb9d94df884dc92071ddf.tar.gz emacs-2a58bbc1830abaf7b51cb9d94df884dc92071ddf.tar.bz2 emacs-2a58bbc1830abaf7b51cb9d94df884dc92071ddf.zip | |
Fix bug #9943 on X.
src/xfns.c (unwind_create_frame): If needed, free the glyph
matrices of the partially constructed frame.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xfns.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 67f8507a26b..cc3391cfee5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,7 @@ * w32fns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame. (Bug#9943) + * xfns.c (unwind_create_frame): Likewise. 2011-11-01 Eli Zaretskii <eliz@gnu.org> diff --git a/src/xfns.c b/src/xfns.c index 913cde75d91..ac030582ffe 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2936,6 +2936,7 @@ unwind_create_frame (Lisp_Object frame) #endif x_free_frame_resources (f); + free_glyphs (f); #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ |