diff options
Diffstat (limited to 'src/character.c')
| -rw-r--r-- | src/character.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/character.c b/src/character.c index 6a689808043..b17f44b1422 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; |