[Emacs-diffs] /srv/bzr/emacs/trunk r108795: * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be

[Dmitry Antipov]

------------------------------------------------------------
revno: 108795
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-29 05:35:32 +0400
message:
  * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be
  undefined.  Convert from xassert to eassert.
  * nsmenu.m: Convert from xassert to eassert.
  * nsterm.m: Likewise.
modified:
  src/ChangeLog
  src/nsfns.m
  src/nsmenu.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-28 19:09:41 +0000
+++ b/src/ChangeLog     2012-06-29 01:35:32 +0000
@@ -1,3 +1,10 @@
+2012-06-29  Dmitry Antipov  <address@hidden>
+
+       * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be
+       undefined.  Convert from xassert to eassert.
+       * nsmenu.m: Convert from xassert to eassert.
+       * nsterm.m: Likewise.
+
 2012-06-28  Stefan Monnier  <address@hidden>
 
        * editfns.c (region_limit): Clip to narrowing (bug#11770).

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2012-06-16 12:24:15 +0000
+++ b/src/nsfns.m       2012-06-29 01:35:32 +0000
@@ -101,7 +101,7 @@
 static Lisp_Object as_script, *as_result;
 static int as_status;
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
 static ptrdiff_t image_cache_refcount;
 #endif
 
@@ -1058,16 +1058,16 @@
   /* If frame is ``official'', nothing to do.  */
   if (NILP (Fmemq (frame, Vframe_list)))
     {
-#if GLYPH_DEBUG && XASSERTS
+#if defined GLYPH_DEBUG && defined ENABLE_CHECKING
       struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 #endif
 
       x_free_frame_resources (f);
       free_glyphs (f);
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
-      xassert (dpyinfo->terminal->image_cache->refcount == 
image_cache_refcount);
+      eassert (dpyinfo->terminal->image_cache->refcount == 
image_cache_refcount);
 #endif
       return Qt;
     }
@@ -1294,7 +1294,7 @@
   x_default_parameter (f, parms, Qright_fringe, Qnil,
                       "rightFringe", "RightFringe", RES_TYPE_NUMBER);
 
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
   image_cache_refcount =
     FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0;
 #endif

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2012-06-16 12:24:15 +0000
+++ b/src/nsmenu.m      2012-06-29 01:35:32 +0000
@@ -1057,7 +1057,7 @@
        {
           /* NS toolbar auto-computes disabled and selected images */
           idx = TOOL_BAR_IMAGE_ENABLED_SELECTED;
-         xassert (ASIZE (image) >= idx);
+         eassert (ASIZE (image) >= idx);
          image = AREF (image, idx);
        }
       else

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-06-22 21:17:42 +0000
+++ b/src/nsterm.m      2012-06-29 01:35:32 +0000
@@ -2108,7 +2108,7 @@
   NSTRACE (ns_after_update_window_line);
 
   /* begin copy from other terms */
-  xassert (w);
+  eassert (w);
 
   if (!desired_row->mode_line_p && !w->pseudo_window_p)
     desired_row->redraw_fringe_bitmaps_p = 1;