diff options
| author | Paul Eggert | 2011-04-09 11:42:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-09 11:42:31 -0700 |
| commit | 762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a (patch) | |
| tree | 7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7 /src/coding.h | |
| parent | eb3f1cc8dfe6a96505f1c5f9174b2712998cb52f (diff) | |
| parent | 8546720e6f25eb988e8215de6678798053031440 (diff) | |
| download | emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.tar.gz emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.zip | |
Merge from mainline.
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 6238a708e76..8414a2fe133 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -449,7 +449,7 @@ struct coding_system | |||
| 449 | -1 in setup_coding_system, and updated by detect_coding. So, | 449 | -1 in setup_coding_system, and updated by detect_coding. So, |
| 450 | when this is equal to the byte length of the text being | 450 | when this is equal to the byte length of the text being |
| 451 | converted, we can skip the actual conversion process. */ | 451 | converted, we can skip the actual conversion process. */ |
| 452 | int head_ascii; | 452 | EMACS_INT head_ascii; |
| 453 | 453 | ||
| 454 | /* The following members are set by encoding/decoding routine. */ | 454 | /* The following members are set by encoding/decoding routine. */ |
| 455 | EMACS_INT produced, produced_char, consumed, consumed_char; | 455 | EMACS_INT produced, produced_char, consumed, consumed_char; |