Mercurial > emacs

comparison src/coding.c @ 109793:b60dcdd855f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents 77fb60d4233b
children 41bf9b6f3b91
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
3900 They may be decoded by post-read-conversion. */ 3900 They may be decoded by post-read-conversion. */
3901 int dim, M, L; 3901 int dim, M, L;
3902 int size; 3902 int size;
3903 3903
3904 ONE_MORE_BYTE (dim); 3904 ONE_MORE_BYTE (dim);
3905 if (dim < 0 || dim > 4) 3905 if (dim < '0' || dim > '4')
3906 goto invalid_code; 3906 goto invalid_code;
3907 ONE_MORE_BYTE (M); 3907 ONE_MORE_BYTE (M);
3908 if (M < 128) 3908 if (M < 128)
3909 goto invalid_code; 3909 goto invalid_code;
3910 ONE_MORE_BYTE (L); 3910 ONE_MORE_BYTE (L);
4095 designation sequence of short-form. */ 4095 designation sequence of short-form. */
4096 4096
4097 #define ENCODE_DESIGNATION(charset, reg, coding) \ 4097 #define ENCODE_DESIGNATION(charset, reg, coding) \
4098 do { \ 4098 do { \
4099 unsigned char final_char = CHARSET_ISO_FINAL (charset); \ 4099 unsigned char final_char = CHARSET_ISO_FINAL (charset); \
4100 char *intermediate_char_94 = "()*+"; \ 4100 const char *intermediate_char_94 = "()*+"; \
4101 char *intermediate_char_96 = ",-./"; \ 4101 const char *intermediate_char_96 = ",-./"; \
4102 int revision = -1; \ 4102 int revision = -1; \
4103 int c; \ 4103 int c; \
4104 \ 4104 \
4105 if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_REVISION) \ 4105 if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_REVISION) \
4106 revision = CHARSET_ISO_REVISION (charset); \ 4106 revision = CHARSET_ISO_REVISION (charset); \