comparison src/keymap.c @ 90614:8dd8c8286063

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 460-475) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 145-152) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
author Miles Bader <miles@gnu.org>
date Sun, 15 Oct 2006 02:54:13 +0000
parents bb0e318b7c53 1a3368a80879
children 6588c6259dfb
comparison
equal deleted inserted replaced
90613:7a2fdfcc7f71 90614:8dd8c8286063
1641 scrollbar or mode line */ 1641 scrollbar or mode line */
1642 = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); 1642 = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0);
1643 1643
1644 /* We are not interested in locations without event data */ 1644 /* We are not interested in locations without event data */
1645 1645
1646 if (EVENT_HAS_PARAMETERS (event)) { 1646 if (EVENT_HAS_PARAMETERS (event))
1647 Lisp_Object kind; 1647 {
1648 1648 Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
1649 kind = EVENT_HEAD_KIND (EVENT_HEAD (event)); 1649 if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
1650 if (EQ (kind, Qmouse_click)) 1650 position = EVENT_START (event);
1651 position = EVENT_START (event); 1651 }
1652 }
1653 } 1652 }
1654 1653
1655 /* Key sequences beginning with mouse clicks 1654 /* Key sequences beginning with mouse clicks
1656 are read using the keymaps of the buffer clicked on, not 1655 are read using the keymaps of the buffer clicked on, not
1657 the current buffer. So we may have to switch the buffer 1656 the current buffer. So we may have to switch the buffer
1740 { 1739 {
1741 Lisp_Object pos, map; 1740 Lisp_Object pos, map;
1742 1741
1743 pos = XCDR (string); 1742 pos = XCDR (string);
1744 string = XCAR (string); 1743 string = XCAR (string);
1745 if (XINT (pos) >= 0 1744 if (INTEGERP (pos)
1745 && XINT (pos) >= 0
1746 && XINT (pos) < SCHARS (string)) 1746 && XINT (pos) < SCHARS (string))
1747 { 1747 {
1748 map = Fget_text_property (pos, Qlocal_map, string); 1748 map = Fget_text_property (pos, Qlocal_map, string);
1749 if (!NILP (map)) 1749 if (!NILP (map))
1750 local_map = map; 1750 local_map = map;