diff options
| author | Juanma Barranquero | 2010-10-08 12:14:47 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-10-08 12:14:47 +0200 |
| commit | 4628bef1eea0f60e846fe6b6591725aa92952de9 (patch) | |
| tree | 9d137b8e0964c0b1ebc4afb4e743e35b807d048d /src/coding.h | |
| parent | 24ac444fbe5d76a7cf09a62b741b9e956ab90d3e (diff) | |
| parent | 2b7c934285417d2eac7a3c603231d22ce7e212d8 (diff) | |
| download | emacs-4628bef1eea0f60e846fe6b6591725aa92952de9.tar.gz emacs-4628bef1eea0f60e846fe6b6591725aa92952de9.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/coding.h b/src/coding.h index 0caa5b2f96f..7233726a250 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -707,6 +707,7 @@ extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, | |||
| 707 | int); | 707 | int); |
| 708 | extern Lisp_Object raw_text_coding_system (Lisp_Object); | 708 | extern Lisp_Object raw_text_coding_system (Lisp_Object); |
| 709 | extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); | 709 | extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); |
| 710 | extern Lisp_Object complement_process_encoding_system (Lisp_Object); | ||
| 710 | 711 | ||
| 711 | extern int decode_coding_gap (struct coding_system *, | 712 | extern int decode_coding_gap (struct coding_system *, |
| 712 | EMACS_INT, EMACS_INT); | 713 | EMACS_INT, EMACS_INT); |