procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/keyboard.c (access_keymap_keyremap): Accept anonymous functions.

Browse source 
Fixes: debbugs:12022
This commit is contained in:
Barry O'Reilly 2012-08-14 08:11:59 -04:00 • committed by Stefan Monnier
parent 96154d32d5
commit 8e99d072be
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-14 Barry OReilly <gundaetiapo@gmail.com> (tiny change)
* keyboard.c (access_keymap_keyremap): Accept anonymous functions
(bug#12022).
2012-08-14 Martin Rudalics <rudalics@gmx.at>
* frame.c (make_frame_without_minibuffer, make_minibuffer_frame)

2
src/keyboard.c
View file

@ -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;

2
src/lisp.h
View file

@ -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)