Mercurial > hg > xemacs-beta
comparison src/keymap.c @ 40:7e54bd776075 r19-15b103
Import from CVS: tag r19-15b103
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:54:25 +0200 |
parents | 4103f0995bd7 |
children | 131b0175ea99 |
comparison
equal
deleted
inserted
replaced
39:06f275776fba | 40:7e54bd776075 |
---|---|
2379 &closure); | 2379 &closure); |
2380 } | 2380 } |
2381 | 2381 |
2382 if (!EQ (buffer, Vmouse_grabbed_buffer)) /* already pushed */ | 2382 if (!EQ (buffer, Vmouse_grabbed_buffer)) /* already pushed */ |
2383 { | 2383 { |
2384 Lisp_Object map = XBUFFER (buffer)->keymap; | |
2385 | |
2384 get_relevant_minor_maps (buffer, &closure); | 2386 get_relevant_minor_maps (buffer, &closure); |
2385 relevant_map_push (XBUFFER (buffer)->keymap, &closure); | 2387 if (!NILP(map)) |
2388 relevant_map_push (map, &closure); | |
2386 } | 2389 } |
2387 } | 2390 } |
2388 } | 2391 } |
2389 else if (!NILP (Fevent_over_toolbar_p (terminal))) | 2392 else if (!NILP (Fevent_over_toolbar_p (terminal))) |
2390 { | 2393 { |
2619 int nmaps; | 2622 int nmaps; |
2620 | 2623 |
2621 assert (EVENTP (event0)); | 2624 assert (EVENTP (event0)); |
2622 | 2625 |
2623 nmaps = get_relevant_keymaps (event0, countof (maps), maps); | 2626 nmaps = get_relevant_keymaps (event0, countof (maps), maps); |
2627 if (nmaps > countof (maps)) | |
2628 nmaps = countof (maps); | |
2624 return (process_event_binding_result | 2629 return (process_event_binding_result |
2625 (lookup_events (event0, nmaps, maps, accept_default))); | 2630 (lookup_events (event0, nmaps, maps, accept_default))); |
2626 } | 2631 } |
2627 | 2632 |
2628 /* Attempts to find a function key mapping corresponding to the | 2633 /* Attempts to find a function key mapping corresponding to the |