emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a0ec54a 2/2: Merge branch 'master' of git.sv.gnu.or


From: Michael Albinus
Subject: [Emacs-diffs] master a0ec54a 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 11 Sep 2015 09:41:27 +0000

branch: master
commit a0ec54ae073abd671bd43002eff0267f5fe8b306
Merge: 58e79d7 2498790
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 src/nsfns.m |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/nsfns.m b/src/nsfns.m
index 89b9f7c..9c805ac 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1009,7 +1009,7 @@ unwind_create_frame (Lisp_Object frame)
       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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]