diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /src/charset.h | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'src/charset.h')
| -rw-r--r-- | src/charset.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/charset.h b/src/charset.h index 1fc552a5bd3..8c87ffe6c3d 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -358,9 +358,9 @@ extern int emacs_mule_charset[256]; | |||
| 358 | 358 | ||
| 359 | #define CHECK_CHARSET_GET_CHARSET(x, charset) \ | 359 | #define CHECK_CHARSET_GET_CHARSET(x, charset) \ |
| 360 | do { \ | 360 | do { \ |
| 361 | int id; \ | 361 | int csid; \ |
| 362 | CHECK_CHARSET_GET_ID (x, id); \ | 362 | CHECK_CHARSET_GET_ID (x, csid); \ |
| 363 | charset = CHARSET_FROM_ID (id); \ | 363 | charset = CHARSET_FROM_ID (csid); \ |
| 364 | } while (0) | 364 | } while (0) |
| 365 | 365 | ||
| 366 | 366 | ||
| @@ -541,4 +541,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object), | |||
| 541 | struct charset *, unsigned, unsigned); | 541 | struct charset *, unsigned, unsigned); |
| 542 | 542 | ||
| 543 | #endif /* EMACS_CHARSET_H */ | 543 | #endif /* EMACS_CHARSET_H */ |
| 544 | |||