From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 27 Jul 2018 09:33:29 +0000 (+0300)
Subject: * src/character.c (char_width): Support glyphs with faces.  (Bug#32276)
X-Git-Tag: emacs-26.1.90~236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71a9151;p=emacs.git

* src/character.c (char_width): Support glyphs with faces.  (Bug#32276)
---

diff --git a/src/character.c b/src/character.c
index deac1fa22ec..48268e04947 100644
--- a/src/character.c
+++ b/src/character.c
@@ -34,6 +34,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
+#include "dispextern.h"
 #include "composite.h"
 #include "disptab.h"
 
@@ -288,13 +289,15 @@ char_width (int c, struct Lisp_Char_Table *dp)
       if (VECTORP (disp))
 	for (i = 0, width = 0; i < ASIZE (disp); i++)
 	  {
+	    int c;
 	    ch = AREF (disp, i);
-	    if (CHARACTERP (ch))
-	      {
-		int w = CHARACTER_WIDTH (XFASTINT (ch));
-		if (INT_ADD_WRAPV (width, w, &width))
-		  string_overflow ();
-	      }
+	    if (GLYPH_CODE_P (ch))
+	      c = GLYPH_CODE_CHAR (ch);
+	    else if (CHARACTERP (ch))
+	      c = XFASTINT (ch);
+	    int w = CHARACTER_WIDTH (c);
+	    if (INT_ADD_WRAPV (width, w, &width))
+	      string_overflow ();
 	  }
     }
   return width;