aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Mackenzie2011-11-03 22:10:02 +0000
committerAlan Mackenzie2011-11-03 22:10:02 +0000
commitbd17fdeeea1446e098cde7e33e1eea60928c4e53 (patch)
treeafc3b3082f244f22c82ccafc2caa8067e3ca6c8f /src
parent85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (diff)
parent2a58bbc1830abaf7b51cb9d94df884dc92071ddf (diff)
downloademacs-bd17fdeeea1446e098cde7e33e1eea60928c4e53.tar.gz
emacs-bd17fdeeea1446e098cde7e33e1eea60928c4e53.zip
Edit lisp/ChangeLog
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. */