diff src/keymap.c @ 109793:b60dcdd855f0

Merge from mainline.

--- a/src/keymap.c	Fri Aug 06 03:43:29 2010 +0000
+++ b/src/keymap.c	Sun Aug 08 22:52:25 2010 +0000
@@ -174,13 +174,13 @@
    initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark");  */
 
 void
-initial_define_key (Lisp_Object keymap, int key, char *defname)
+initial_define_key (Lisp_Object keymap, int key, const char *defname)
 {
   store_in_keymap (keymap, make_number (key), intern_c_string (defname));
 }
 
 void
-initial_define_lispy_key (Lisp_Object keymap, char *keyname, char *defname)
+initial_define_lispy_key (Lisp_Object keymap, const char *keyname, const char *defname)
 {
   store_in_keymap (keymap, intern_c_string (keyname), intern_c_string (defname));
 }