aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-21 20:54:57 +0000
committerGerd Moellmann2000-09-21 20:54:57 +0000
commit6bbd7a29592594e23e5cb98467e608f10b00f877 (patch)
tree1e60389bc0f5c349fc0a39b2609b1a60b084e133 /src/keymap.c
parent8179cccd88a3f114b0e4891c033ecd302dfb094e (diff)
downloademacs-6bbd7a29592594e23e5cb98467e608f10b00f877.tar.gz
emacs-6bbd7a29592594e23e5cb98467e608f10b00f877.zip
Avoid some more compiler warnings.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 26659410227..864c860db5c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -269,8 +269,7 @@ get_keymap_1 (object, error, autoload)
269 end: 269 end:
270 if (error) 270 if (error)
271 wrong_type_argument (Qkeymapp, object); 271 wrong_type_argument (Qkeymapp, object);
272 else 272 return Qnil;
273 return Qnil;
274} 273}
275 274
276 275
@@ -1775,10 +1774,10 @@ spaces are put between sequence elements, etc.")
1775 (keys) 1774 (keys)
1776 Lisp_Object keys; 1775 Lisp_Object keys;
1777{ 1776{
1778 int len; 1777 int len = 0;
1779 int i, i_byte; 1778 int i, i_byte;
1780 Lisp_Object sep; 1779 Lisp_Object sep;
1781 Lisp_Object *args; 1780 Lisp_Object *args = NULL;
1782 1781
1783 if (STRINGP (keys)) 1782 if (STRINGP (keys))
1784 { 1783 {
@@ -2021,6 +2020,7 @@ around function keys and event symbols.")
2021 return Fcopy_sequence (key); 2020 return Fcopy_sequence (key);
2022 else 2021 else
2023 error ("KEY must be an integer, cons, symbol, or string"); 2022 error ("KEY must be an integer, cons, symbol, or string");
2023 return Qnil;
2024} 2024}
2025 2025
2026char * 2026char *
@@ -2846,6 +2846,8 @@ describe_map (map, keys, elt_describer, partial, shadow, seen, nomenu)
2846 int first = 1; 2846 int first = 1;
2847 struct gcpro gcpro1, gcpro2, gcpro3; 2847 struct gcpro gcpro1, gcpro2, gcpro3;
2848 2848
2849 suppress = Qnil;
2850
2849 if (!NILP (keys) && XFASTINT (Flength (keys)) > 0) 2851 if (!NILP (keys) && XFASTINT (Flength (keys)) > 0)
2850 { 2852 {
2851 /* Call Fkey_description first, to avoid GC bug for the other string. */ 2853 /* Call Fkey_description first, to avoid GC bug for the other string. */
@@ -3027,6 +3029,8 @@ describe_vector (vector, elt_prefix, elt_describer,
3027 int character; 3029 int character;
3028 int starting_i; 3030 int starting_i;
3029 3031
3032 suppress = Qnil;
3033
3030 if (indices == 0) 3034 if (indices == 0)
3031 indices = (int *) alloca (3 * sizeof (int)); 3035 indices = (int *) alloca (3 * sizeof (int));
3032 3036