From: Dave Love Date: Thu, 9 May 2002 18:00:40 +0000 (+0000) Subject: (coding_inherit_eol_type) X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~910 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b74e4686d549abe1ff888e92d77b7e1d8e90b897;p=emacs.git (coding_inherit_eol_type) (Fset_terminal_coding_system_internal) (Fset_safe_terminal_coding_system_internal): Fix arg declarations. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4c0b59bf28b..dff8f6abe2d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2002-05-09 Dave Love + + * 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 * 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 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0. diff --git a/src/coding.c b/src/coding.c index ae7c52918e1..be18ab80c3b 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4651,6 +4651,7 @@ raw_text_coding_system (coding_system) Lisp_Object coding_inherit_eol_type (coding_system, parent) + Lisp_Object coding_system, parent; { Lisp_Object spec, attrs, eol_type; @@ -6940,6 +6941,7 @@ DEFUN ("set-terminal-coding-system-internal", Sset_terminal_coding_system_internal, 1, 1, 0, doc: /* Internal use only. */) (coding_system) + Lisp_Object coding_system; { CHECK_SYMBOL (coding_system); setup_coding_system (Fcheck_coding_system (coding_system), @@ -6959,6 +6961,7 @@ DEFUN ("set-safe-terminal-coding-system-internal", Sset_safe_terminal_coding_system_internal, 1, 1, 0, doc: /* Internal use only. */) (coding_system) + Lisp_Object coding_system; { CHECK_SYMBOL (coding_system); setup_coding_system (Fcheck_coding_system (coding_system),