1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 02:50:26 -08:00

Merge from trunk.

This commit is contained in:
Paul Eggert 2011-11-18 23:15:21 -08:00
commit 9898bd0e5b
594 changed files with 5790 additions and 4751 deletions

View file

@ -518,7 +518,7 @@ struct coding_system
#define CODING_REQUIRE_DETECTION_MASK 0x1000
#define CODING_RESET_AT_BOL_MASK 0x2000
/* Return 1 if the coding context CODING requires annotaion
/* Return 1 if the coding context CODING requires annotation
handling. */
#define CODING_REQUIRE_ANNOTATION(coding) \
((coding)->common_flags & CODING_ANNOTATION_MASK)