summaryrefslogtreecommitdiff
path: root/src/character.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-09-13 15:29:26 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-09-13 15:31:04 -0700
commit4a0d8b4cadcfef8c39581031bd00b3175ca37b43 (patch)
tree11d941293684a649b7765e2afe06edeff5a25d60 /src/character.c
parent3988ceaa1cfa2022443906750cbb30127a1e161f (diff)
downloademacs-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.c')
-rw-r--r--src/character.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/character.c b/src/character.c
index b19e41d660a..75a7dab6845 100644
--- a/src/character.c
+++ b/src/character.c
@@ -278,7 +278,7 @@ If the multibyte character does not represent a byte, return -1. */)
static ptrdiff_t
char_width (int c, struct Lisp_Char_Table *dp)
{
- ptrdiff_t width = CHAR_WIDTH (c);
+ ptrdiff_t width = CHARACTER_WIDTH (c);
if (dp)
{
@@ -291,7 +291,7 @@ char_width (int c, struct Lisp_Char_Table *dp)
ch = AREF (disp, i);
if (CHARACTERP (ch))
{
- int w = CHAR_WIDTH (XFASTINT (ch));
+ int w = CHARACTER_WIDTH (XFASTINT (ch));
if (INT_ADD_WRAPV (width, w, &width))
string_overflow ();
}