diff options
| author | Paul Eggert | 2012-01-07 11:51:13 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-07 11:51:13 -0800 |
| commit | 9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch) | |
| tree | 3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /src/coding.h | |
| parent | dbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff) | |
| parent | 6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff) | |
| download | emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip | |
Merge from trunk.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.h b/src/coding.h index b694e6c6b6e..908e222cc68 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Header for coding system handler. | 1 | /* Header for coding system handler. |
| 2 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 3 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 4 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 4 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 5 | National Institute of Advanced Industrial Science and Technology (AIST) | 5 | National Institute of Advanced Industrial Science and Technology (AIST) |
| @@ -485,7 +485,7 @@ struct coding_system | |||
| 485 | element. The following elements are OFFSET, ANNOTATION-TYPE, and | 485 | element. The following elements are OFFSET, ANNOTATION-TYPE, and |
| 486 | a sequence of actual data for the annotation. OFFSET is a | 486 | a sequence of actual data for the annotation. OFFSET is a |
| 487 | character position offset from dst_pos or src_pos, | 487 | character position offset from dst_pos or src_pos, |
| 488 | ANNOTATION-TYPE specfies the meaning of the annotation and how to | 488 | ANNOTATION-TYPE specifies the meaning of the annotation and how to |
| 489 | handle the following data.. */ | 489 | handle the following data.. */ |
| 490 | int *charbuf; | 490 | int *charbuf; |
| 491 | int charbuf_size, charbuf_used; | 491 | int charbuf_size, charbuf_used; |