diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/coding.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
Merge from mainline.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/coding.h b/src/coding.h index 8414a2fe133..85e153dcc3a 100644 --- a/src/coding.h +++ b/src/coding.h @@ -695,10 +695,6 @@ extern int encoding_buffer_size (struct coding_system *, int); extern void setup_coding_system (Lisp_Object, struct coding_system *); extern Lisp_Object coding_charset_list (struct coding_system *); extern Lisp_Object coding_system_charset_list (Lisp_Object); -extern void detect_coding (struct coding_system *); -extern Lisp_Object code_convert_region (Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int); extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object, Lisp_Object, int, int, int); extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, @@ -709,8 +705,6 @@ extern Lisp_Object complement_process_encoding_system (Lisp_Object); extern int decode_coding_gap (struct coding_system *, EMACS_INT, EMACS_INT); -extern int encode_coding_gap (struct coding_system *, - EMACS_INT, EMACS_INT); extern void decode_coding_object (struct coding_system *, Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, Lisp_Object); @@ -757,10 +751,9 @@ extern Lisp_Object preferred_coding_system (void); extern Lisp_Object Qutf_8, Qutf_8_emacs; -extern Lisp_Object Qcoding_system, Qeol_type, Qcoding_category_index; +extern Lisp_Object Qcoding_category_index; extern Lisp_Object Qcoding_system_p; extern Lisp_Object Qraw_text, Qemacs_mule, Qno_conversion, Qundecided; -extern Lisp_Object Qiso_2022; extern Lisp_Object Qbuffer_file_coding_system; extern Lisp_Object Qunix, Qdos, Qmac; @@ -789,4 +782,3 @@ extern char emacs_mule_bytes[256]; extern int emacs_mule_string_char (unsigned char *); #endif /* EMACS_CODING_H */ - |