From: Dan Nicolaescu Date: Wed, 3 Dec 2008 02:40:26 +0000 (+0000) Subject: * keyboard.c (read_char_help_form_unwind): Specify the type for ARG. X-Git-Tag: emacs-pretest-23.0.90~1349 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63c125ab03c1f3c6c33d810ea6d395b17962fef1;p=emacs.git * keyboard.c (read_char_help_form_unwind): Specify the type for ARG. * character.c (c_string_width): Specify the type for LEN. --- diff --git a/src/ChangeLog b/src/ChangeLog index a932a97db73..01518fff288 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-12-03 Dan Nicolaescu + + * keyboard.c (read_char_help_form_unwind): Specify the type for ARG. + + * character.c (c_string_width): Specify the type for LEN. + 2008-12-03 Kenichi Handa * coding.c (decode_coding_utf_16): Initialize consumed_chars_base diff --git a/src/character.c b/src/character.c index 27ea100e0dd..1f88432b964 100644 --- a/src/character.c +++ b/src/character.c @@ -411,9 +411,7 @@ usage: (char-width CHAR) */) respectively. */ int -c_string_width (str, len, precision, nchars, nbytes) - const unsigned char *str; - int precision, *nchars, *nbytes; +c_string_width (const unsigned char *str, int len, int precision, int *nchars, int *nbytes) { int i = 0, i_byte = 0; int width = 0; diff --git a/src/keyboard.c b/src/keyboard.c index 77d58931d14..f04ab9cf2e9 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2429,7 +2429,7 @@ static void record_char (); static Lisp_Object help_form_saved_window_configs; static Lisp_Object -read_char_help_form_unwind (arg) +read_char_help_form_unwind (Lisp_Object arg) { Lisp_Object window_config = XCAR (help_form_saved_window_configs); help_form_saved_window_configs = XCDR (help_form_saved_window_configs);