Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

This commit is contained in:
Michael Albinus 2015-09-11 11:40:47 +02:00
commit a0ec54ae07

View file

@ -1009,7 +1009,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
x_free_frame_resources (f);
free_glyphs (f);
#ifdef GLYPH_DEBUG
#if defined GLYPH_DEBUG && defined ENABLE_CHECKING
/* Check that reference counts are indeed correct. */
eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
#endif