comparison src/coding.h @ 110855:bec49af30c2f

Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 08 Oct 2010 12:14:47 +0200
parents 228a5fa4eda0 4d672e9d91bf
children a80c1e8d9df4
comparison
equal deleted inserted replaced
110820:e60b0b3ed516 110855:bec49af30c2f
705 Lisp_Object, int, int, int); 705 Lisp_Object, int, int, int);
706 extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, 706 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);
713 extern int encode_coding_gap (struct coding_system *, 714 extern int encode_coding_gap (struct coding_system *,
714 EMACS_INT, EMACS_INT); 715 EMACS_INT, EMACS_INT);