Mercurial > emacs
comparison src/keymap.c @ 90386:2ecafc6d5db7
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 239-258)
- Update from CVS
- (Ffield_beginning, find_field): Undo change of 2006-04-23.
- Rcirc patch from Ryan Yeske
- Merge from gnus--rel--5.10
- Clean up lisp/gnus/ChangeLog a bit
* gnus--rel--5.10 (patch 91-98)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 02 May 2006 05:51:52 +0000 |
| parents | 72dea2ff0142 3f5619e77411 |
| children | 146cd8369025 |
comparison
equal
deleted
inserted
replaced
| 90385:72dea2ff0142 | 90386:2ecafc6d5db7 |
|---|---|
| 839 | 839 |
| 840 static Lisp_Object | 840 static Lisp_Object |
| 841 store_in_keymap (keymap, idx, def) | 841 store_in_keymap (keymap, idx, def) |
| 842 Lisp_Object keymap; | 842 Lisp_Object keymap; |
| 843 register Lisp_Object idx; | 843 register Lisp_Object idx; |
| 844 register Lisp_Object def; | 844 Lisp_Object def; |
| 845 { | 845 { |
| 846 /* Flush any reverse-map cache. */ | 846 /* Flush any reverse-map cache. */ |
| 847 where_is_cache = Qnil; | 847 where_is_cache = Qnil; |
| 848 where_is_cache_keymaps = Qt; | 848 where_is_cache_keymaps = Qt; |
| 849 | 849 |
| 1224 | 1224 |
| 1225 keymap = get_keymap (cmd, 0, 1); | 1225 keymap = get_keymap (cmd, 0, 1); |
| 1226 if (!CONSP (keymap)) | 1226 if (!CONSP (keymap)) |
| 1227 /* We must use Fkey_description rather than just passing key to | 1227 /* We must use Fkey_description rather than just passing key to |
| 1228 error; key might be a vector, not a string. */ | 1228 error; key might be a vector, not a string. */ |
| 1229 error ("Key sequence %s uses invalid prefix characters", | 1229 error ("Key sequence %s starts with non-prefix key %s", |
| 1230 SDATA (Fkey_description (key, Qnil))); | 1230 SDATA (Fkey_description (key, Qnil)), |
| 1231 SDATA (Fkey_description (Fsubstring (key, make_number (0), | |
| 1232 make_number (idx)), | |
| 1233 Qnil))); | |
| 1231 } | 1234 } |
| 1232 } | 1235 } |
| 1233 | 1236 |
| 1234 /* This function may GC (it calls Fkey_binding). */ | 1237 /* This function may GC (it calls Fkey_binding). */ |
| 1235 | 1238 |
