From d5abf903fabc2114ceae5fe60cbf5fb0e6de45d0 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 26 Aug 2022 15:06:59 -0400 Subject: [PATCH] Revert "fix some (not all) glyph_to_cmap odd ret" This reverts commit bb4474bbaffec06fe1a59767f2694790025f016f. --- include/display.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/display.h b/include/display.h index fd117134f..ab69aaece 100644 --- 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)