changeset 88474:fcc1029dcac2

*** empty log message ***
author Dave Love <fx@gnu.org>
date Thu, 09 May 2002 18:00:40 +0000
parents b47ee8b1ce03
children 9d54c1d6cd0a
files src/ChangeLog
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu May 09 17:59:31 2002 +0000
+++ b/src/ChangeLog	Thu May 09 18:00:40 2002 +0000
@@ -1,3 +1,15 @@
+2002-05-09  Dave Love  <fx@gnu.org>
+
+	* syntax.h (syntax_temp) [!__GNUC__]: Declare.
+
+	* dispextern.h (generate_ascii_font): Fix return type.
+
+	* xfaces.c (generate_ascii_font): Fix arg declaration.
+
+	* coding.c (coding_inherit_eol_type)
+	(Fset_terminal_coding_system_internal)
+	(Fset_safe_terminal_coding_system_internal): Fix arg declarations.
+
 2002-05-08  Kenichi Handa  <handa@etl.go.jp>
 
 	* coding.c (decode_coding_charset, encode_coding_charset): Handle
@@ -68,7 +80,6 @@
 	* coding.c (produce_chars): Set the variable `multibytep' correctly.
 	(decode_coding_gap): Set coding->dst_multibyte correctly.
 
->>>>>>> 1.2479.2.9
 2002-03-07  Kenichi Handa  <handa@etl.go.jp>
 
 	* coding.c (encode_coding_utf_8): Initialize produced_chars to 0.