aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorJuanma Barranquero2006-12-10 23:33:46 +0000
committerJuanma Barranquero2006-12-10 23:33:46 +0000
commit64b2caa5fe0742434bfcc2478522295b6e509085 (patch)
tree2e80d8df004ed1b55e0d458d2dd8dd60c973b1cd /src/keymap.c
parent5820771bca3f16a5f5b4dad1cca57df03d309132 (diff)
downloademacs-64b2caa5fe0742434bfcc2478522295b6e509085.tar.gz
emacs-64b2caa5fe0742434bfcc2478522295b6e509085.zip
(Flookup_key): Doc fix.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 11e3e348da5..d367d7d3758 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1247,7 +1247,8 @@ buffer position instead of point are used. */)
1247 1247
1248DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0, 1248DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0,
1249 doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition. 1249 doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition.
1250nil means undefined. See doc of `define-key' for kinds of definitions. 1250A value of nil means undefined. See doc of `define-key'
1251for kinds of definitions.
1251 1252
1252A number as value means KEY is "too long"; 1253A number as value means KEY is "too long";
1253that is, characters or symbols in it except for the last one 1254that is, characters or symbols in it except for the last one
@@ -1622,13 +1623,13 @@ specified buffer position instead of point are used.
1622 are read using the keymaps of the buffer clicked on, not 1623 are read using the keymaps of the buffer clicked on, not
1623 the current buffer. So we may have to switch the buffer 1624 the current buffer. So we may have to switch the buffer
1624 here. */ 1625 here. */
1625 1626
1626 if (CONSP (position)) 1627 if (CONSP (position))
1627 { 1628 {
1628 Lisp_Object window; 1629 Lisp_Object window;
1629 1630
1630 window = POSN_WINDOW (position); 1631 window = POSN_WINDOW (position);
1631 1632
1632 if (WINDOWP (window) 1633 if (WINDOWP (window)
1633 && BUFFERP (XWINDOW (window)->buffer) 1634 && BUFFERP (XWINDOW (window)->buffer)
1634 && XBUFFER (XWINDOW (window)->buffer) != current_buffer) 1635 && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
@@ -1640,13 +1641,13 @@ specified buffer position instead of point are used.
1640 would not be a problem here, but it is easier to keep 1641 would not be a problem here, but it is easier to keep
1641 things the same. 1642 things the same.
1642 */ 1643 */
1643 1644
1644 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); 1645 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
1645 1646
1646 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); 1647 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer));
1647 } 1648 }
1648 } 1649 }
1649 1650
1650 if (! NILP (current_kboard->Voverriding_terminal_local_map)) 1651 if (! NILP (current_kboard->Voverriding_terminal_local_map))
1651 { 1652 {
1652 value = Flookup_key (current_kboard->Voverriding_terminal_local_map, 1653 value = Flookup_key (current_kboard->Voverriding_terminal_local_map,
@@ -1669,8 +1670,8 @@ specified buffer position instead of point are used.
1669 : MARKERP (position) ? marker_position (position) 1670 : MARKERP (position) ? marker_position (position)
1670 : PT; 1671 : PT;
1671 1672
1672 local_map = get_local_map (pt, current_buffer, Qlocal_map); 1673 local_map = get_local_map (pt, current_buffer, Qlocal_map);
1673 keymap = get_local_map (pt, current_buffer, Qkeymap); 1674 keymap = get_local_map (pt, current_buffer, Qkeymap);
1674 1675
1675 if (CONSP (position)) 1676 if (CONSP (position))
1676 { 1677 {
@@ -1678,7 +1679,7 @@ specified buffer position instead of point are used.
1678 1679
1679 /* For a mouse click, get the local text-property keymap 1680 /* For a mouse click, get the local text-property keymap
1680 of the place clicked on, rather than point. */ 1681 of the place clicked on, rather than point. */
1681 1682
1682 if (POSN_INBUFFER_P (position)) 1683 if (POSN_INBUFFER_P (position))
1683 { 1684 {
1684 Lisp_Object pos; 1685 Lisp_Object pos;
@@ -1689,7 +1690,7 @@ specified buffer position instead of point are used.
1689 { 1690 {
1690 local_map = get_local_map (XINT (pos), 1691 local_map = get_local_map (XINT (pos),
1691 current_buffer, Qlocal_map); 1692 current_buffer, Qlocal_map);
1692 1693
1693 keymap = get_local_map (XINT (pos), 1694 keymap = get_local_map (XINT (pos),
1694 current_buffer, Qkeymap); 1695 current_buffer, Qkeymap);
1695 } 1696 }
@@ -1700,12 +1701,12 @@ specified buffer position instead of point are used.
1700 string displayed via the `display' property, 1701 string displayed via the `display' property,
1701 consider `local-map' and `keymap' properties of 1702 consider `local-map' and `keymap' properties of
1702 that string. */ 1703 that string. */
1703 1704
1704 if (string = POSN_STRING (position), 1705 if (string = POSN_STRING (position),
1705 (CONSP (string) && STRINGP (XCAR (string)))) 1706 (CONSP (string) && STRINGP (XCAR (string))))
1706 { 1707 {
1707 Lisp_Object pos, map; 1708 Lisp_Object pos, map;
1708 1709
1709 pos = XCDR (string); 1710 pos = XCDR (string);
1710 string = XCAR (string); 1711 string = XCAR (string);
1711 if (INTEGERP (pos) 1712 if (INTEGERP (pos)
@@ -1721,7 +1722,7 @@ specified buffer position instead of point are used.
1721 keymap = map; 1722 keymap = map;
1722 } 1723 }
1723 } 1724 }
1724 1725
1725 } 1726 }
1726 1727
1727 if (! NILP (keymap)) 1728 if (! NILP (keymap))