From 8e99d072be7ce8aff322d65dc87527c4118722f2 Mon Sep 17 00:00:00 2001 From: Barry O'Reilly Date: Tue, 14 Aug 2012 08:11:59 -0400 Subject: [PATCH] * src/keyboard.c (access_keymap_keyremap): Accept anonymous functions. Fixes: debbugs:12022 --- src/ChangeLog | 5 +++++ src/keyboard.c | 2 +- src/lisp.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cf24ee95a05..93dc127acdc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-14 Barry OReilly (tiny change) + + * keyboard.c (access_keymap_keyremap): Accept anonymous functions + (bug#12022). + 2012-08-14 Martin Rudalics * frame.c (make_frame_without_minibuffer, make_minibuffer_frame) diff --git a/src/keyboard.c b/src/keyboard.c index 5ed1f9f2c69..a286e9f3036 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8836,7 +8836,7 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt, /* If the keymap gives a function, not an array, then call the function with one arg and use its value instead. */ - if (SYMBOLP (next) && !NILP (Ffboundp (next)) && do_funcall) + if (do_funcall && FUNCTIONP (next)) { Lisp_Object tem; tem = next; diff --git a/src/lisp.h b/src/lisp.h index 3dbea6e0f72..f6aa46d3f41 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -641,7 +641,7 @@ clip_to_bounds (ptrdiff_t lower, EMACS_INT num, ptrdiff_t upper) typedef struct interval *INTERVAL; -/* Complain if object is not string or buffer type */ +/* Complain if object is not string or buffer type. */ #define CHECK_STRING_OR_BUFFER(x) \ CHECK_TYPE (STRINGP (x) || BUFFERP (x), Qbuffer_or_string_p, x) -- 2.39.2