diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/charset.h | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/charset.h')
| -rw-r--r-- | src/charset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.h b/src/charset.h index dbe9c776a0d..6e6422f3c73 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -255,7 +255,7 @@ extern Lisp_Object Vcharset_list; | |||
| 255 | extern Lisp_Object Viso_2022_charset_list; | 255 | extern Lisp_Object Viso_2022_charset_list; |
| 256 | extern Lisp_Object Vemacs_mule_charset_list; | 256 | extern Lisp_Object Vemacs_mule_charset_list; |
| 257 | 257 | ||
| 258 | extern struct charset *emacs_mule_charset[256]; | 258 | extern int emacs_mule_charset[256]; |
| 259 | 259 | ||
| 260 | extern Lisp_Object Vcurrent_iso639_language; | 260 | extern Lisp_Object Vcurrent_iso639_language; |
| 261 | 261 | ||