comparison src/keymap.c @ 438:84b14dcb0985 r21-2-27

Import from CVS: tag r21-2-27
author cvs
date Mon, 13 Aug 2007 11:32:25 +0200
parents 3ecd8885ac67
children 8de8e3f6228a
comparison
equal deleted inserted replaced
437:e2a4e8b94b82 438:84b14dcb0985
2114 int i; 2114 int i;
2115 2115
2116 if (nkeys == 0) 2116 if (nkeys == 0)
2117 return Qnil; 2117 return Qnil;
2118 2118
2119 if (nkeys < (countof (kkk))) 2119 if (nkeys < countof (kkk))
2120 raw_keys = kkk; 2120 raw_keys = kkk;
2121 else 2121 else
2122 raw_keys = alloca_array (struct key_data, nkeys); 2122 raw_keys = alloca_array (struct key_data, nkeys);
2123 2123
2124 for (i = 0; i < nkeys; i++) 2124 for (i = 0; i < nkeys; i++)
2144 2144
2145 CHECK_LIVE_EVENT (event_head); 2145 CHECK_LIVE_EVENT (event_head);
2146 2146
2147 nkeys = event_chain_count (event_head); 2147 nkeys = event_chain_count (event_head);
2148 2148
2149 if (nkeys < (countof (kkk))) 2149 if (nkeys < countof (kkk))
2150 raw_keys = kkk; 2150 raw_keys = kkk;
2151 else 2151 else
2152 raw_keys = alloca_array (struct key_data, nkeys); 2152 raw_keys = alloca_array (struct key_data, nkeys);
2153 2153
2154 nkeys = 0; 2154 nkeys = 0;
2370 buffer); 2370 buffer);
2371 2371
2372 get_relevant_extent_keymaps 2372 get_relevant_extent_keymaps
2373 (Fevent_modeline_position (terminal), 2373 (Fevent_modeline_position (terminal),
2374 XBUFFER (buffer)->generated_modeline_string, 2374 XBUFFER (buffer)->generated_modeline_string,
2375 /* #### third arg should maybe be a glyph. */ 2375 Fevent_glyph_extent (terminal), &closure);
2376 Qnil, &closure);
2377 2376
2378 if (!UNBOUNDP (map) && !NILP (map)) 2377 if (!UNBOUNDP (map) && !NILP (map))
2379 relevant_map_push (get_keymap (map, 1, 1), &closure); 2378 relevant_map_push (get_keymap (map, 1, 1), &closure);
2380 } 2379 }
2381 else 2380 else