diff options
| author | Paul Eggert | 2011-04-10 23:58:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-10 23:58:57 -0700 |
| commit | 74ab6df507f0f4707a8bd25924fbdba9d1610f4f (patch) | |
| tree | d57a60f363f201a9c44b233e884aa9d226353de8 /src | |
| parent | 38dfbee187191f15de9e6a171eee8be5072db296 (diff) | |
| download | emacs-74ab6df507f0f4707a8bd25924fbdba9d1610f4f.tar.gz emacs-74ab6df507f0f4707a8bd25924fbdba9d1610f4f.zip | |
* coding.h (coding, code_convert_region, encode_coding_gap): Remove
decls.
* coding.c (Vsjis_coding_system, Vbig5_coding_system):
(iso_code_class, detect_coding, code_convert_region): Now static.
(encode_coding_gap): Remove; unused.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/coding.c | 34 | ||||
| -rw-r--r-- | src/coding.h | 6 |
3 files changed, 11 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 03f4fcee063..35acd030955 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2011-04-11 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * coding.h (coding, code_convert_region, encode_coding_gap): Remove | ||
| 4 | decls. | ||
| 5 | * coding.c (Vsjis_coding_system, Vbig5_coding_system): | ||
| 6 | (iso_code_class, detect_coding, code_convert_region): Now static. | ||
| 7 | (encode_coding_gap): Remove; unused. | ||
| 8 | |||
| 3 | * chartab.c (chartab_chars, chartab_bits): Now static. | 9 | * chartab.c (chartab_chars, chartab_bits): Now static. |
| 4 | 10 | ||
| 5 | * charset.h (charset_iso_8859_1): Remove decl. | 11 | * charset.h (charset_iso_8859_1): Remove decl. |
diff --git a/src/coding.c b/src/coding.c index d2124db73f2..c29713a5c0c 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -358,8 +358,8 @@ static Lisp_Object Qtranslation_table_for_decode; | |||
| 358 | static Lisp_Object Qtranslation_table_for_encode; | 358 | static Lisp_Object Qtranslation_table_for_encode; |
| 359 | 359 | ||
| 360 | /* Two special coding systems. */ | 360 | /* Two special coding systems. */ |
| 361 | Lisp_Object Vsjis_coding_system; | 361 | static Lisp_Object Vsjis_coding_system; |
| 362 | Lisp_Object Vbig5_coding_system; | 362 | static Lisp_Object Vbig5_coding_system; |
| 363 | 363 | ||
| 364 | /* ISO2022 section */ | 364 | /* ISO2022 section */ |
| 365 | 365 | ||
| @@ -2862,7 +2862,7 @@ encode_coding_emacs_mule (struct coding_system *coding) | |||
| 2862 | COMPOSITION_WITH_RULE_ALTCHARS: | 2862 | COMPOSITION_WITH_RULE_ALTCHARS: |
| 2863 | ESC 4 ALTCHAR [ RULE ALTCHAR ] ESC 0 CHAR [ CHAR ] ESC 1 */ | 2863 | ESC 4 ALTCHAR [ RULE ALTCHAR ] ESC 0 CHAR [ CHAR ] ESC 1 */ |
| 2864 | 2864 | ||
| 2865 | enum iso_code_class_type iso_code_class[256]; | 2865 | static enum iso_code_class_type iso_code_class[256]; |
| 2866 | 2866 | ||
| 2867 | #define SAFE_CHARSET_P(coding, id) \ | 2867 | #define SAFE_CHARSET_P(coding, id) \ |
| 2868 | ((id) <= (coding)->max_charset_id \ | 2868 | ((id) <= (coding)->max_charset_id \ |
| @@ -6212,7 +6212,7 @@ adjust_coding_eol_type (struct coding_system *coding, int eol_seen) | |||
| 6212 | system is detected, update fields of CODING by the detected coding | 6212 | system is detected, update fields of CODING by the detected coding |
| 6213 | system. */ | 6213 | system. */ |
| 6214 | 6214 | ||
| 6215 | void | 6215 | static void |
| 6216 | detect_coding (struct coding_system *coding) | 6216 | detect_coding (struct coding_system *coding) |
| 6217 | { | 6217 | { |
| 6218 | const unsigned char *src, *src_end; | 6218 | const unsigned char *src, *src_end; |
| @@ -7530,30 +7530,6 @@ decode_coding_gap (struct coding_system *coding, | |||
| 7530 | return coding->result; | 7530 | return coding->result; |
| 7531 | } | 7531 | } |
| 7532 | 7532 | ||
| 7533 | int | ||
| 7534 | encode_coding_gap (struct coding_system *coding, | ||
| 7535 | EMACS_INT chars, EMACS_INT bytes) | ||
| 7536 | { | ||
| 7537 | int count = SPECPDL_INDEX (); | ||
| 7538 | |||
| 7539 | code_conversion_save (0, 0); | ||
| 7540 | |||
| 7541 | coding->src_object = Fcurrent_buffer (); | ||
| 7542 | coding->src_chars = chars; | ||
| 7543 | coding->src_bytes = bytes; | ||
| 7544 | coding->src_pos = -chars; | ||
| 7545 | coding->src_pos_byte = -bytes; | ||
| 7546 | coding->src_multibyte = chars < bytes; | ||
| 7547 | coding->dst_object = coding->src_object; | ||
| 7548 | coding->dst_pos = PT; | ||
| 7549 | coding->dst_pos_byte = PT_BYTE; | ||
| 7550 | |||
| 7551 | encode_coding (coding); | ||
| 7552 | |||
| 7553 | unbind_to (count, Qnil); | ||
| 7554 | return coding->result; | ||
| 7555 | } | ||
| 7556 | |||
| 7557 | 7533 | ||
| 7558 | /* Decode the text in the range FROM/FROM_BYTE and TO/TO_BYTE in | 7534 | /* Decode the text in the range FROM/FROM_BYTE and TO/TO_BYTE in |
| 7559 | SRC_OBJECT into DST_OBJECT by coding context CODING. | 7535 | SRC_OBJECT into DST_OBJECT by coding context CODING. |
| @@ -8834,7 +8810,7 @@ is nil. */) | |||
| 8834 | } | 8810 | } |
| 8835 | 8811 | ||
| 8836 | 8812 | ||
| 8837 | Lisp_Object | 8813 | static Lisp_Object |
| 8838 | code_convert_region (Lisp_Object start, Lisp_Object end, | 8814 | code_convert_region (Lisp_Object start, Lisp_Object end, |
| 8839 | Lisp_Object coding_system, Lisp_Object dst_object, | 8815 | Lisp_Object coding_system, Lisp_Object dst_object, |
| 8840 | int encodep, int norecord) | 8816 | int encodep, int norecord) |
diff --git a/src/coding.h b/src/coding.h index ff7fcc7c3ac..85e153dcc3a 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -695,10 +695,6 @@ extern int encoding_buffer_size (struct coding_system *, int); | |||
| 695 | extern void setup_coding_system (Lisp_Object, struct coding_system *); | 695 | extern void setup_coding_system (Lisp_Object, struct coding_system *); |
| 696 | extern Lisp_Object coding_charset_list (struct coding_system *); | 696 | extern Lisp_Object coding_charset_list (struct coding_system *); |
| 697 | extern Lisp_Object coding_system_charset_list (Lisp_Object); | 697 | extern Lisp_Object coding_system_charset_list (Lisp_Object); |
| 698 | extern void detect_coding (struct coding_system *); | ||
| 699 | extern Lisp_Object code_convert_region (Lisp_Object, Lisp_Object, | ||
| 700 | Lisp_Object, Lisp_Object, | ||
| 701 | int, int); | ||
| 702 | extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object, | 698 | extern Lisp_Object code_convert_string (Lisp_Object, Lisp_Object, |
| 703 | Lisp_Object, int, int, int); | 699 | Lisp_Object, int, int, int); |
| 704 | extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, | 700 | extern Lisp_Object code_convert_string_norecord (Lisp_Object, Lisp_Object, |
| @@ -709,8 +705,6 @@ extern Lisp_Object complement_process_encoding_system (Lisp_Object); | |||
| 709 | 705 | ||
| 710 | extern int decode_coding_gap (struct coding_system *, | 706 | extern int decode_coding_gap (struct coding_system *, |
| 711 | EMACS_INT, EMACS_INT); | 707 | EMACS_INT, EMACS_INT); |
| 712 | extern int encode_coding_gap (struct coding_system *, | ||
| 713 | EMACS_INT, EMACS_INT); | ||
| 714 | extern void decode_coding_object (struct coding_system *, | 708 | extern void decode_coding_object (struct coding_system *, |
| 715 | Lisp_Object, EMACS_INT, EMACS_INT, | 709 | Lisp_Object, EMACS_INT, EMACS_INT, |
| 716 | EMACS_INT, EMACS_INT, Lisp_Object); | 710 | EMACS_INT, EMACS_INT, Lisp_Object); |