diff options
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/charset.c b/src/charset.c index 32836d459f..55cbfc4a39 100644 --- a/src/charset.c +++ b/src/charset.c @@ -493,7 +493,7 @@ load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile, int co unbind_to (count, Qnil); if (fd < 0 || ! (fp = fdopen (fd, "r"))) - error ("Failure in loading charset map: %S", SDATA (mapfile)); + error ("Failure in loading charset map: %s", SDATA (mapfile)); /* Use SAFE_ALLOCA instead of alloca, as `charset_map_entries' is large (larger than MAX_ALLOCA). */ @@ -1000,7 +1000,7 @@ usage: (define-charset-internal ...) */) { CHECK_NUMBER (val); if (XINT (val) < '0' || XINT (val) > 127) - error ("Invalid iso-final-char: %d", XINT (val)); + error ("Invalid iso-final-char: %"pEd, XINT (val)); charset.iso_final = XINT (val); } @@ -1022,7 +1022,7 @@ usage: (define-charset-internal ...) */) { CHECK_NATNUM (val); if ((XINT (val) > 0 && XINT (val) <= 128) || XINT (val) >= 256) - error ("Invalid emacs-mule-id: %d", XINT (val)); + error ("Invalid emacs-mule-id: %"pEd, XINT (val)); charset.emacs_mule_id = XINT (val); } @@ -1440,11 +1440,17 @@ check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, Lisp_Obje CHECK_NATNUM (final_char); if (XINT (dimension) > 3) - error ("Invalid DIMENSION %d, it should be 1, 2, or 3", XINT (dimension)); + error ("Invalid DIMENSION %"pEd", it should be 1, 2, or 3", + XINT (dimension)); if (XINT (chars) != 94 && XINT (chars) != 96) - error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); + error ("Invalid CHARS %"pEd", it should be 94 or 96", XINT (chars)); if (XINT (final_char) < '0' || XINT (final_char) > '~') - error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); + { + unsigned char str[MAX_MULTIBYTE_LENGTH + 1]; + int len = CHAR_STRING (XINT (chars), str); + str[len] = '\0'; + error ("Invalid FINAL-CHAR %s, it should be `0'..`~'", str); + } } |