Mercurial > emacs
changeset 35256:f39ff8270082
(get_local_map): Change TYPE to Lisp_Object.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 12 Jan 2001 11:18:20 +0000 |
| parents | d473294a0124 |
| children | 187c0b3da663 |
| files | src/intervals.c |
| diffstat | 1 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/intervals.c Fri Jan 12 11:17:53 2001 +0000 +++ b/src/intervals.c Fri Jan 12 11:18:20 2001 +0000 @@ -2161,18 +2161,16 @@ return 1; } -/* If TYPE is `keymap', return the map specified by the `keymap' - property at POSITION in BUFFER or nil. - - Otherwise return the proper local map for position POSITION in - BUFFER. Use the map specified by the local-map property, if any. - Otherwise, use BUFFER's local map. */ +/* Return the proper local keymap TYPE for position POSITION in + BUFFER; TYPE should be one of `keymap' or `local-map'. Use the map + specified by the PROP property, if any. Otherwise, if TYPE is + `local-map' use BUFFER's local map. */ Lisp_Object get_local_map (position, buffer, type) register int position; register struct buffer *buffer; - enum map_property type; + Lisp_Object type; { Lisp_Object prop, lispy_position, lispy_buffer; int old_begv, old_zv, old_begv_byte, old_zv_byte; @@ -2198,9 +2196,7 @@ --position; XSETFASTINT (lispy_position, position); XSETBUFFER (lispy_buffer, buffer); - prop = Fget_char_property (lispy_position, - type == keymap ? Qkeymap : Qlocal_map, - lispy_buffer); + prop = Fget_char_property (lispy_position, type, lispy_buffer); BUF_BEGV (buffer) = old_begv; BUF_ZV (buffer) = old_zv; @@ -2212,7 +2208,7 @@ if (CONSP (prop)) return prop; - if (type == keymap) + if (EQ (type, Qkeymap)) return Qnil; else return buffer->keymap;