diff options
| author | Dan Nicolaescu | 2008-12-03 02:40:26 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-12-03 02:40:26 +0000 |
| commit | 63c125ab03c1f3c6c33d810ea6d395b17962fef1 (patch) | |
| tree | 277017224e28d94e25c32d32ef51b2dcfec51866 /src | |
| parent | 5ccafc2c2ded2d3702c9a41539c7528745291893 (diff) | |
| download | emacs-63c125ab03c1f3c6c33d810ea6d395b17962fef1.tar.gz emacs-63c125ab03c1f3c6c33d810ea6d395b17962fef1.zip | |
* keyboard.c (read_char_help_form_unwind): Specify the type for ARG.
* character.c (c_string_width): Specify the type for LEN.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/character.c | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a932a97db73..01518fff288 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-12-03 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * keyboard.c (read_char_help_form_unwind): Specify the type for ARG. | ||
| 4 | |||
| 5 | * character.c (c_string_width): Specify the type for LEN. | ||
| 6 | |||
| 1 | 2008-12-03 Kenichi Handa <handa@m17n.org> | 7 | 2008-12-03 Kenichi Handa <handa@m17n.org> |
| 2 | 8 | ||
| 3 | * coding.c (decode_coding_utf_16): Initialize consumed_chars_base | 9 | * 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) */) | |||
| 411 | respectively. */ | 411 | respectively. */ |
| 412 | 412 | ||
| 413 | int | 413 | int |
| 414 | c_string_width (str, len, precision, nchars, nbytes) | 414 | c_string_width (const unsigned char *str, int len, int precision, int *nchars, int *nbytes) |
| 415 | const unsigned char *str; | ||
| 416 | int precision, *nchars, *nbytes; | ||
| 417 | { | 415 | { |
| 418 | int i = 0, i_byte = 0; | 416 | int i = 0, i_byte = 0; |
| 419 | int width = 0; | 417 | 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 (); | |||
| 2429 | 2429 | ||
| 2430 | static Lisp_Object help_form_saved_window_configs; | 2430 | static Lisp_Object help_form_saved_window_configs; |
| 2431 | static Lisp_Object | 2431 | static Lisp_Object |
| 2432 | read_char_help_form_unwind (arg) | 2432 | read_char_help_form_unwind (Lisp_Object arg) |
| 2433 | { | 2433 | { |
| 2434 | Lisp_Object window_config = XCAR (help_form_saved_window_configs); | 2434 | Lisp_Object window_config = XCAR (help_form_saved_window_configs); |
| 2435 | help_form_saved_window_configs = XCDR (help_form_saved_window_configs); | 2435 | help_form_saved_window_configs = XCDR (help_form_saved_window_configs); |