diff options
| author | Joakim Verona | 2010-10-18 22:05:07 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-10-18 22:05:07 +0200 |
| commit | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (patch) | |
| tree | 723f254768f9e503504ab4c8b68801f80a56591a /src/coding.h | |
| parent | 35f4b80a934b299b3b18e62f5db44f64c240e65b (diff) | |
| parent | e48eb34332dc91de823314090451459ba2ffacbf (diff) | |
| download | emacs-13cfe8df462ab8da9f0028e16cc84dcaceaca3d1.tar.gz emacs-13cfe8df462ab8da9f0028e16cc84dcaceaca3d1.zip | |
merge from upstream
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); |