diff options
| author | Karl Heuer | 1995-06-06 01:39:40 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-06-06 01:39:40 +0000 |
| commit | 6de34814d61fea789ea3f27f0314e7e4d74adf23 (patch) | |
| tree | 8a37c148dc7be9acef5727a7990c217a7c7b68b5 /src | |
| parent | 996f5f0e31c678d595cd8a0327a0ea25f15ae610 (diff) | |
| download | emacs-6de34814d61fea789ea3f27f0314e7e4d74adf23.tar.gz emacs-6de34814d61fea789ea3f27f0314e7e4d74adf23.zip | |
(cmd_error): Use NULL, not 0, as arg to cmd_error_internal.
(menu_bar_items): Likewise, for arg of current_minor_maps.
(record_char): Add cast.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index afaab7bebe2..c4e44ba9e5e 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -843,7 +843,7 @@ cmd_error (data) | |||
| 843 | old_length = Vprint_length; | 843 | old_length = Vprint_length; |
| 844 | XSETFASTINT(Vprint_level, 10); | 844 | XSETFASTINT(Vprint_level, 10); |
| 845 | XSETFASTINT(Vprint_length, 10); | 845 | XSETFASTINT(Vprint_length, 10); |
| 846 | cmd_error_internal (data, 0); | 846 | cmd_error_internal (data, NULL); |
| 847 | Vprint_level = old_level; | 847 | Vprint_level = old_level; |
| 848 | Vprint_length = old_length; | 848 | Vprint_length = old_length; |
| 849 | 849 | ||
| @@ -2118,7 +2118,7 @@ record_char (c) | |||
| 2118 | if (XUINT (c) < 0x100) | 2118 | if (XUINT (c) < 0x100) |
| 2119 | putc (XINT (c), dribble); | 2119 | putc (XINT (c), dribble); |
| 2120 | else | 2120 | else |
| 2121 | fprintf (dribble, " 0x%x", XUINT (c)); | 2121 | fprintf (dribble, " 0x%x", (int) XUINT (c)); |
| 2122 | } | 2122 | } |
| 2123 | else | 2123 | else |
| 2124 | { | 2124 | { |
| @@ -4358,7 +4358,7 @@ menu_bar_items (old) | |||
| 4358 | else | 4358 | else |
| 4359 | { | 4359 | { |
| 4360 | /* No, so use major and minor mode keymaps. */ | 4360 | /* No, so use major and minor mode keymaps. */ |
| 4361 | nmaps = current_minor_maps (0, &tmaps) + 2; | 4361 | nmaps = current_minor_maps (NULL, &tmaps) + 2; |
| 4362 | maps = (Lisp_Object *) alloca (nmaps * sizeof (maps[0])); | 4362 | maps = (Lisp_Object *) alloca (nmaps * sizeof (maps[0])); |
| 4363 | bcopy (tmaps, maps, (nmaps - 2) * sizeof (maps[0])); | 4363 | bcopy (tmaps, maps, (nmaps - 2) * sizeof (maps[0])); |
| 4364 | #ifdef USE_TEXT_PROPERTIES | 4364 | #ifdef USE_TEXT_PROPERTIES |