Revert "fix some (not all) glyph_to_cmap odd ret"

This reverts commit bb4474bbaffec06fe1a59767f2694790025f016f.

diff --git a/include/display.h b/include/display.h
index fd117134f07f655bf76e5668d6d8e2f436104c96..ab69aaece74969af316e63ca64b116a4ddf40d6b 100644 (file)
--- a/include/display.h
+++ b/include/display.h
@@ -729,11 +729,9 @@ enum glyph_offsets {
                     ? (S_altar)                                        \
                     : glyph_is_cmap_b(glyph)                           \
                       ? (((glyph) - GLYPH_CMAP_B_OFF) + S_grave)       \
-                      : glyph_is_cmap_zap(glyph)                       \
-                        ? (((glyph) - GLYPH_ZAP_OFF) + S_vbeam)        \
-                        : glyph_is_cmap_c(glyph)                       \
-                          ? (((glyph) - GLYPH_CMAP_C_OFF) + S_digbeam) \
-                          : NO_GLYPH)
+                      : glyph_is_cmap_c(glyph)                         \
+                        ? (((glyph) - GLYPH_CMAP_C_OFF) + S_digbeam)   \
+                        : NO_GLYPH)
 
 #define glyph_to_swallow(glyph) \
     (glyph_is_swallow(glyph) ? (((glyph) - GLYPH_SWALLOW_OFF) & 0x7) : 0)