Mercurial > emacs
changeset 74574:3c809b430d91
(Flookup_key): Doc fix.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 10 Dec 2006 23:33:46 +0000 |
parents | 1341133a3cd9 |
children | 34a1ff09106b |
files | src/keymap.c |
diffstat | 1 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keymap.c Sun Dec 10 23:32:00 2006 +0000 +++ b/src/keymap.c Sun Dec 10 23:33:46 2006 +0000 @@ -1247,7 +1247,8 @@ DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0, doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition. -nil means undefined. See doc of `define-key' for kinds of definitions. +A value of nil means undefined. See doc of `define-key' +for kinds of definitions. A number as value means KEY is "too long"; that is, characters or symbols in it except for the last one @@ -1622,13 +1623,13 @@ are read using the keymaps of the buffer clicked on, not the current buffer. So we may have to switch the buffer here. */ - + if (CONSP (position)) { Lisp_Object window; - + window = POSN_WINDOW (position); - + if (WINDOWP (window) && BUFFERP (XWINDOW (window)->buffer) && XBUFFER (XWINDOW (window)->buffer) != current_buffer) @@ -1640,13 +1641,13 @@ would not be a problem here, but it is easier to keep things the same. */ - + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); - + set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); } } - + if (! NILP (current_kboard->Voverriding_terminal_local_map)) { value = Flookup_key (current_kboard->Voverriding_terminal_local_map, @@ -1669,8 +1670,8 @@ : MARKERP (position) ? marker_position (position) : PT; - local_map = get_local_map (pt, current_buffer, Qlocal_map); - keymap = get_local_map (pt, current_buffer, Qkeymap); + local_map = get_local_map (pt, current_buffer, Qlocal_map); + keymap = get_local_map (pt, current_buffer, Qkeymap); if (CONSP (position)) { @@ -1678,7 +1679,7 @@ /* For a mouse click, get the local text-property keymap of the place clicked on, rather than point. */ - + if (POSN_INBUFFER_P (position)) { Lisp_Object pos; @@ -1689,7 +1690,7 @@ { local_map = get_local_map (XINT (pos), current_buffer, Qlocal_map); - + keymap = get_local_map (XINT (pos), current_buffer, Qkeymap); } @@ -1700,12 +1701,12 @@ string displayed via the `display' property, consider `local-map' and `keymap' properties of that string. */ - + if (string = POSN_STRING (position), (CONSP (string) && STRINGP (XCAR (string)))) { Lisp_Object pos, map; - + pos = XCDR (string); string = XCAR (string); if (INTEGERP (pos) @@ -1721,7 +1722,7 @@ keymap = map; } } - + } if (! NILP (keymap))