Mercurial > hg > xemacs-beta

comparison src/keymap.c @ 114:8619ce7e4c50 r20-1b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents 4be1180a9e89
children 6b37e6ddd302
comparison
equal deleted inserted replaced
113:2ec2fe4a4c89 114:8619ce7e4c50
2376 &closure); 2376 &closure);
2377 } 2377 }
2378 2378
2379 if (!EQ (buffer, Vmouse_grabbed_buffer)) /* already pushed */ 2379 if (!EQ (buffer, Vmouse_grabbed_buffer)) /* already pushed */
2380 { 2380 {
2381 Lisp_Object map = XBUFFER (buffer)->keymap;
2382
2381 get_relevant_minor_maps (buffer, &closure); 2383 get_relevant_minor_maps (buffer, &closure);
2382 relevant_map_push (XBUFFER (buffer)->keymap, &closure); 2384 if (!NILP(map))
2385 relevant_map_push (map, &closure);
2383 } 2386 }
2384 } 2387 }
2385 } 2388 }
2386 else if (!NILP (Fevent_over_toolbar_p (terminal))) 2389 else if (!NILP (Fevent_over_toolbar_p (terminal)))
2387 { 2390 {
2616 int nmaps; 2619 int nmaps;
2617 2620
2618 assert (EVENTP (event0)); 2621 assert (EVENTP (event0));
2619 2622
2620 nmaps = get_relevant_keymaps (event0, countof (maps), maps); 2623 nmaps = get_relevant_keymaps (event0, countof (maps), maps);
2624 if (nmaps > countof (maps))
2625 nmaps = countof (maps);
2621 return (process_event_binding_result 2626 return (process_event_binding_result
2622 (lookup_events (event0, nmaps, maps, accept_default))); 2627 (lookup_events (event0, nmaps, maps, accept_default)));
2623 } 2628 }
2624 2629
2625 /* Attempts to find a function key mapping corresponding to the 2630 /* Attempts to find a function key mapping corresponding to the