aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-09-11 11:40:47 +0200
committerMichael Albinus2015-09-11 11:40:47 +0200
commita0ec54ae073abd671bd43002eff0267f5fe8b306 (patch)
tree3417474261ba93dc5d5815f87fa49fad08d45452
parent58e79d70dd4b778bfda6bacfa66b54d0f32816c8 (diff)
parent24987908857f6cc5e25f17638db45a73f32603a3 (diff)
downloademacs-a0ec54ae073abd671bd43002eff0267f5fe8b306.tar.gz
emacs-a0ec54ae073abd671bd43002eff0267f5fe8b306.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-rw-r--r--src/nsfns.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 89b9f7c4b62..9c805ac20d1 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1009,7 +1009,7 @@ unwind_create_frame (Lisp_Object frame)
1009 x_free_frame_resources (f); 1009 x_free_frame_resources (f);
1010 free_glyphs (f); 1010 free_glyphs (f);
1011 1011
1012#ifdef GLYPH_DEBUG 1012#if defined GLYPH_DEBUG && defined ENABLE_CHECKING
1013 /* Check that reference counts are indeed correct. */ 1013 /* Check that reference counts are indeed correct. */
1014 eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount); 1014 eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
1015#endif 1015#endif