summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfont.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f646bd66981..386a9b3a0e5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -26,6 +26,7 @@
* callproc.c (Fcall_process): Likewise.
* doprnt.c (doprnt): Likewise.
* indent.c (compute_motion): Likewise.
+ * xfont.c (xfont_decode_coding_xlfd): Likewise.
* character.c (strwidth): Make its argument const char *, not const
unsigned char *, since more callers prefer it that way. All callers
changed.
diff --git a/src/xfont.c b/src/xfont.c
index 222b4d9edf9..f8aace3663c 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -182,7 +182,7 @@ xfont_decode_coding_xlfd (char *xlfd, int len, char *output)
while (*p0)
{
c = *(unsigned char *) p0++;
- p1 += CHAR_STRING (c, p1);
+ p1 += CHAR_STRING (c, (unsigned char *) p1);
if (--len == 0)
break;
}