From: tomo <tomo>
Date: Fri, 9 Jun 2000 08:21:26 +0000 (+0000)
Subject: (find_charsets_in_charc_string): New prototype; delete
X-Git-Tag: r21-2-34-utf-2000-0_16-1~63
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d8c9e39b7a138bbc5e888b8e9f908c5e575365e1;p=chise%2Fxemacs-chise.git.1

(find_charsets_in_charc_string): New prototype; delete
`find_charsets_in_emchar_string'.
(charc_string_displayed_columns): New prototype; delete
`emchar_string_displayed_columns'.
(convert_charc_string_into_bufbyte_dynarr): New prototype; delete
`convert_charc_string_into_bufbyte_dynarr'.
(convert_charc_string_into_malloced_string): New prototype; delete
`convert_charc_string_into_malloced_string'.
---

diff --git a/src/buffer.h b/src/buffer.h
index 35cf9c1..3529200 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1251,20 +1251,20 @@ void set_buffer_point (struct buffer *buf, Bufpos pos, Bytind bipos);
 void find_charsets_in_bufbyte_string (Charset_ID *charsets,
 				      const Bufbyte *str,
 				      Bytecount len);
-void find_charsets_in_emchar_string (Charset_ID *charsets,
-				     const Emchar *str,
-				     Charcount len);
+void find_charsets_in_charc_string (Charset_ID *charsets,
+				    const Charc *str,
+				    Charcount len);
 int bufbyte_string_displayed_columns (const Bufbyte *str, Bytecount len);
-int emchar_string_displayed_columns (const Emchar *str, Charcount len);
-void convert_bufbyte_string_into_emchar_dynarr (const Bufbyte *str,
-						Bytecount len,
-						Emchar_dynarr *dyn);
+int charc_string_displayed_columns (const Charc *str, Charcount len);
+void convert_bufbyte_string_into_charc_dynarr (const Bufbyte *str,
+					       Bytecount len,
+					       Charc_dynarr *dyn);
 Charcount convert_bufbyte_string_into_emchar_string (const Bufbyte *str,
 						     Bytecount len,
 						     Emchar *arr);
-void convert_emchar_string_into_bufbyte_dynarr (Emchar *arr, int nels,
-						Bufbyte_dynarr *dyn);
-Bufbyte *convert_emchar_string_into_malloced_string (Emchar *arr, int nels,
+void convert_charc_string_into_bufbyte_dynarr (Charc *arr, int nels,
+					       Bufbyte_dynarr *dyn);
+Bufbyte *convert_charc_string_into_malloced_string (Charc *arr, int nels,
 						    Bytecount *len_out);
 /* from marker.c */
 void init_buffer_markers (struct buffer *b);