comparison src/file-coding.h @ 4533:4a7c4ccac2fe

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 22 Dec 2008 12:05:47 +0000
parents 726060ee587c
children 80e0588fb42f
comparison
equal deleted inserted replaced
4527:8418d1ad4944 4533:4a7c4ccac2fe
1044 Lisp_Object codesys); 1044 Lisp_Object codesys);
1045 Lisp_Object detect_coding_stream (Lisp_Object stream); 1045 Lisp_Object detect_coding_stream (Lisp_Object stream);
1046 Ichar decode_big5_char (int o1, int o2); 1046 Ichar decode_big5_char (int o1, int o2);
1047 void add_entry_to_coding_system_type_list (struct coding_system_methods *m); 1047 void add_entry_to_coding_system_type_list (struct coding_system_methods *m);
1048 Lisp_Object make_internal_coding_system (Lisp_Object existing, 1048 Lisp_Object make_internal_coding_system (Lisp_Object existing,
1049 Ascbyte *prefix, 1049 const Ascbyte *prefix,
1050 Lisp_Object type, 1050 Lisp_Object type,
1051 Lisp_Object description, 1051 Lisp_Object description,
1052 Lisp_Object props); 1052 Lisp_Object props);
1053 1053
1054 #define LSTREAM_FL_NO_CLOSE_OTHER (1 << 16) 1054 #define LSTREAM_FL_NO_CLOSE_OTHER (1 << 16)