diff options
| author | Joakim Verona | 2015-02-01 00:37:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-01 00:37:46 +0100 |
| commit | 69815dfe3704f8a8c733843f1fd04546cbb0f4d0 (patch) | |
| tree | cee6910753a51b9a5ee88e2431c9bcad099e8ba8 /src/coding.h | |
| parent | 4edad429cafb2f0b1fda028be58367286ab04f1c (diff) | |
| parent | a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e (diff) | |
| download | emacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.tar.gz emacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.zip | |
Merge branch 'master' into xwidget
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 d49d786e6dd..c73a9cc3263 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -705,6 +705,7 @@ extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, | |||
| 705 | extern Lisp_Object encode_file_name (Lisp_Object); | 705 | extern Lisp_Object encode_file_name (Lisp_Object); |
| 706 | extern Lisp_Object decode_file_name (Lisp_Object); | 706 | extern Lisp_Object decode_file_name (Lisp_Object); |
| 707 | extern Lisp_Object raw_text_coding_system (Lisp_Object); | 707 | extern Lisp_Object raw_text_coding_system (Lisp_Object); |
| 708 | extern bool raw_text_coding_system_p (struct coding_system *); | ||
| 708 | extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); | 709 | extern Lisp_Object coding_inherit_eol_type (Lisp_Object, Lisp_Object); |
| 709 | extern Lisp_Object complement_process_encoding_system (Lisp_Object); | 710 | extern Lisp_Object complement_process_encoding_system (Lisp_Object); |
| 710 | 711 | ||