Mercurial > emacs
comparison src/keymap.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 8949aad5e992 |
| children | 64732fa6188a |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 172 For example: | 172 For example: |
| 173 | 173 |
| 174 initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark"); */ | 174 initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark"); */ |
| 175 | 175 |
| 176 void | 176 void |
| 177 initial_define_key (Lisp_Object keymap, int key, char *defname) | 177 initial_define_key (Lisp_Object keymap, int key, const char *defname) |
| 178 { | 178 { |
| 179 store_in_keymap (keymap, make_number (key), intern_c_string (defname)); | 179 store_in_keymap (keymap, make_number (key), intern_c_string (defname)); |
| 180 } | 180 } |
| 181 | 181 |
| 182 void | 182 void |
| 183 initial_define_lispy_key (Lisp_Object keymap, char *keyname, char *defname) | 183 initial_define_lispy_key (Lisp_Object keymap, const char *keyname, const char *defname) |
| 184 { | 184 { |
| 185 store_in_keymap (keymap, intern_c_string (keyname), intern_c_string (defname)); | 185 store_in_keymap (keymap, intern_c_string (keyname), intern_c_string (defname)); |
| 186 } | 186 } |
| 187 | 187 |
| 188 DEFUN ("keymapp", Fkeymapp, Skeymapp, 1, 1, 0, | 188 DEFUN ("keymapp", Fkeymapp, Skeymapp, 1, 1, 0, |