diff options
| author | Paul Eggert | 2011-09-03 16:03:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-03 16:03:38 -0700 |
| commit | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (patch) | |
| tree | 9f2ffa6f7a6562abf661a4951012b488ad8b1ae7 /src/coding.h | |
| parent | 74b880cbc18bd0194c7b1fc44c4a983ee05adae2 (diff) | |
| parent | bc3200871917d5c54c8c4299a06bf8f8ba2ea02d (diff) | |
| download | emacs-b49e353d9d01adbe60bc5d0b1658b4ef978b0b06.tar.gz emacs-b49e353d9d01adbe60bc5d0b1658b4ef978b0b06.zip | |
Merge from trunk.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.h b/src/coding.h index 85e153dcc3a..fdf9b762e75 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -415,7 +415,7 @@ struct coding_system | |||
| 415 | setup_coding_system. At the early stage of building time, this | 415 | setup_coding_system. At the early stage of building time, this |
| 416 | value is -1 in the array coding_categories to indicate that no | 416 | value is -1 in the array coding_categories to indicate that no |
| 417 | coding-system of that category is yet defined. */ | 417 | coding-system of that category is yet defined. */ |
| 418 | int id; | 418 | ptrdiff_t id; |
| 419 | 419 | ||
| 420 | /* Flag bits of the coding system. The meaning of each bit is common | 420 | /* Flag bits of the coding system. The meaning of each bit is common |
| 421 | to all types of coding systems. */ | 421 | to all types of coding systems. */ |