aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-11-03 23:56:32 +0200
committerEli Zaretskii2011-11-03 23:56:32 +0200
commit2a58bbc1830abaf7b51cb9d94df884dc92071ddf (patch)
treee337ec99861e92b458cf90477430138961e44591 /src
parent14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff)
downloademacs-2a58bbc1830abaf7b51cb9d94df884dc92071ddf.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfns.c1
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 @@
2 2
3 * w32fns.c (unwind_create_frame): If needed, free the glyph 3 * w32fns.c (unwind_create_frame): If needed, free the glyph
4 matrices of the partially constructed frame. (Bug#9943) 4 matrices of the partially constructed frame. (Bug#9943)
5 * xfns.c (unwind_create_frame): Likewise.
5 6
62011-11-01 Eli Zaretskii <eliz@gnu.org> 72011-11-01 Eli Zaretskii <eliz@gnu.org>
7 8
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)
2936#endif 2936#endif
2937 2937
2938 x_free_frame_resources (f); 2938 x_free_frame_resources (f);
2939 free_glyphs (f);
2939 2940
2940#if GLYPH_DEBUG 2941#if GLYPH_DEBUG
2941 /* Check that reference counts are indeed correct. */ 2942 /* Check that reference counts are indeed correct. */