diff options
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 69 |
1 files changed, 24 insertions, 45 deletions
diff --git a/src/coding.c b/src/coding.c index 711ada59c85..b49070e5e16 100644 --- a/src/coding.c +++ b/src/coding.c @@ -300,27 +300,30 @@ encode_coding_XXX (struct coding_system *coding) Lisp_Object Vcoding_system_hash_table; -Lisp_Object Qcoding_system, Qcoding_aliases, Qeol_type; +static Lisp_Object Qcoding_system, Qeol_type; +static Lisp_Object Qcoding_aliases; Lisp_Object Qunix, Qdos; Lisp_Object Qbuffer_file_coding_system; -Lisp_Object Qpost_read_conversion, Qpre_write_conversion; -Lisp_Object Qdefault_char; +static Lisp_Object Qpost_read_conversion, Qpre_write_conversion; +static Lisp_Object Qdefault_char; Lisp_Object Qno_conversion, Qundecided; -Lisp_Object Qcharset, Qiso_2022, Qutf_8, Qutf_16, Qshift_jis, Qbig5; -Lisp_Object Qbig, Qlittle; -Lisp_Object Qcoding_system_history; -Lisp_Object Qvalid_codes; -Lisp_Object QCcategory, QCmnemonic, QCdefault_char; -Lisp_Object QCdecode_translation_table, QCencode_translation_table; -Lisp_Object QCpost_read_conversion, QCpre_write_conversion; -Lisp_Object QCascii_compatible_p; +Lisp_Object Qcharset, Qutf_8; +static Lisp_Object Qiso_2022; +static Lisp_Object Qutf_16, Qshift_jis, Qbig5; +static Lisp_Object Qbig, Qlittle; +static Lisp_Object Qcoding_system_history; +static Lisp_Object Qvalid_codes; +static Lisp_Object QCcategory, QCmnemonic, QCdefault_char; +static Lisp_Object QCdecode_translation_table, QCencode_translation_table; +static Lisp_Object QCpost_read_conversion, QCpre_write_conversion; +static Lisp_Object QCascii_compatible_p; Lisp_Object Qcall_process, Qcall_process_region; Lisp_Object Qstart_process, Qopen_network_stream; -Lisp_Object Qtarget_idx; +static Lisp_Object Qtarget_idx; -Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; -Lisp_Object Qinterrupted, Qinsufficient_memory; +static Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source; +static Lisp_Object Qinterrupted, Qinsufficient_memory; /* If a symbol has this property, evaluate the value to define the symbol as a coding system. */ @@ -351,12 +354,12 @@ struct coding_system safe_terminal_coding; Lisp_Object Qtranslation_table; Lisp_Object Qtranslation_table_id; -Lisp_Object Qtranslation_table_for_decode; -Lisp_Object Qtranslation_table_for_encode; +static Lisp_Object Qtranslation_table_for_decode; +static Lisp_Object Qtranslation_table_for_encode; /* Two special coding systems. */ -Lisp_Object Vsjis_coding_system; -Lisp_Object Vbig5_coding_system; +static Lisp_Object Vsjis_coding_system; +static Lisp_Object Vbig5_coding_system; /* ISO2022 section */ @@ -2859,7 +2862,7 @@ encode_coding_emacs_mule (struct coding_system *coding) COMPOSITION_WITH_RULE_ALTCHARS: ESC 4 ALTCHAR [ RULE ALTCHAR ] ESC 0 CHAR [ CHAR ] ESC 1 */ -enum iso_code_class_type iso_code_class[256]; +static enum iso_code_class_type iso_code_class[256]; #define SAFE_CHARSET_P(coding, id) \ ((id) <= (coding)->max_charset_id \ @@ -6209,7 +6212,7 @@ adjust_coding_eol_type (struct coding_system *coding, int eol_seen) system is detected, update fields of CODING by the detected coding system. */ -void +static void detect_coding (struct coding_system *coding) { const unsigned char *src, *src_end; @@ -7527,30 +7530,6 @@ decode_coding_gap (struct coding_system *coding, return coding->result; } -int -encode_coding_gap (struct coding_system *coding, - EMACS_INT chars, EMACS_INT bytes) -{ - int count = SPECPDL_INDEX (); - - code_conversion_save (0, 0); - - coding->src_object = Fcurrent_buffer (); - coding->src_chars = chars; - coding->src_bytes = bytes; - coding->src_pos = -chars; - coding->src_pos_byte = -bytes; - coding->src_multibyte = chars < bytes; - coding->dst_object = coding->src_object; - coding->dst_pos = PT; - coding->dst_pos_byte = PT_BYTE; - - encode_coding (coding); - - unbind_to (count, Qnil); - return coding->result; -} - /* Decode the text in the range FROM/FROM_BYTE and TO/TO_BYTE in SRC_OBJECT into DST_OBJECT by coding context CODING. @@ -8831,7 +8810,7 @@ is nil. */) } -Lisp_Object +static Lisp_Object code_convert_region (Lisp_Object start, Lisp_Object end, Lisp_Object coding_system, Lisp_Object dst_object, int encodep, int norecord) |