diff options
| author | Paul Eggert | 2011-11-19 19:07:02 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 19:07:02 -0800 |
| commit | 615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch) | |
| tree | e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src/coding.h | |
| parent | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff) | |
| parent | e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff) | |
| download | emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.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 fdf9b762e75..2621928adc3 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -518,7 +518,7 @@ struct coding_system | |||
| 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 | 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 |
| 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 | 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 |
| 520 | 520 | ||
| 521 | /* Return 1 if the coding context CODING requires annotaion | 521 | /* Return 1 if the coding context CODING requires annotation |
| 522 | handling. */ | 522 | handling. */ |
| 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ | 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ |
| 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) | 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) |