diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-13 15:29:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-13 15:31:04 -0700 |
| commit | 4a0d8b4cadcfef8c39581031bd00b3175ca37b43 (patch) | |
| tree | 11d941293684a649b7765e2afe06edeff5a25d60 /src/character.h | |
| parent | 3988ceaa1cfa2022443906750cbb30127a1e161f (diff) | |
| download | emacs-4a0d8b4cadcfef8c39581031bd00b3175ca37b43.tar.gz | |
Port to ISO/IEC TS 18661-1:2014
* src/character.h (CHARACTER_WIDTH): Rename from CHAR_WIDTH.
All uses changed.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/character.h b/src/character.h index 2cb76b0f2d5..b72b61d7054 100644 --- a/src/character.h +++ b/src/character.h @@ -588,9 +588,10 @@ sanitize_char_width (EMACS_INT width) /* Return the width of character C. The width is measured by how many columns C will occupy on the screen when displayed in the current - buffer. */ + buffer. The name CHARACTER_WIDTH avoids a collision with <limits.h> + CHAR_WIDTH when enabled; see ISO/IEC TS 18661-1:2014. */ -#define CHAR_WIDTH(c) \ +#define CHARACTER_WIDTH(c) \ (ASCII_CHAR_P (c) \ ? ASCII_CHAR_WIDTH (c) \ : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c)))) |