comparison src/keymap.c @ 195:a2f645c6b9f8 r20-3b24

Import from CVS: tag r20-3b24
author cvs
date Mon, 13 Aug 2007 09:59:05 +0200
parents 489f57a838ef
children acd284d43ca1
comparison
equal deleted inserted replaced
194:2947057885e5 195:a2f645c6b9f8
2426 2426
2427 /* Next check the extents at the text position, if any */ 2427 /* Next check the extents at the text position, if any */
2428 if (!NILP (pos)) 2428 if (!NILP (pos))
2429 { 2429 {
2430 Lisp_Object extent; 2430 Lisp_Object extent;
2431 for (extent = Fextent_at (pos, buffer_or_string, Qkeymap, Qnil, Qat); 2431 for (extent = Fextent_at (pos, buffer_or_string, Qkeymap, Qnil, Qnil);
2432 !NILP (extent); 2432 !NILP (extent);
2433 extent = Fextent_at (pos, buffer_or_string, Qkeymap, extent, Qat)) 2433 extent = Fextent_at (pos, buffer_or_string, Qkeymap, extent, Qnil))
2434 { 2434 {
2435 if (!NILP (Fextent_in_region_p (extent, pos, pos, Qnil))) 2435 Lisp_Object keymap = Fextent_property (extent, Qkeymap, Qnil);
2436 { 2436 if (!NILP (keymap))
2437 Lisp_Object keymap = Fextent_property (extent, Qkeymap, Qnil); 2437 relevant_map_push (get_keymap (keymap, 1, 1), closure);
2438 if (!NILP (keymap)) 2438 QUIT;
2439 relevant_map_push (get_keymap (keymap, 1, 1), closure);
2440 QUIT;
2441 }
2442 } 2439 }
2443 } 2440 }
2444 } 2441 }
2445 2442
2446 static Lisp_Object 2443 static Lisp_Object