[Emacs-diffs] /srv/bzr/emacs/trunk r109603: * src/keyboard.c (access_keymap_keyremap): Accept anonymous functions.

[Stefan Monnier]

------------------------------------------------------------
revno: 109603
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12022
author: Barry OReilly <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-14 08:11:59 -0400
message:
  * src/keyboard.c (access_keymap_keyremap): Accept anonymous functions.
modified:
  src/ChangeLog
  src/keyboard.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-14 08:44:24 +0000
+++ b/src/ChangeLog     2012-08-14 12:11:59 +0000
@@ -1,3 +1,8 @@
+2012-08-14  Barry OReilly  <address@hidden>  (tiny change)
+
+       * keyboard.c (access_keymap_keyremap): Accept anonymous functions
+       (bug#12022).
+
 2012-08-14  Martin Rudalics  <address@hidden>
 
        * frame.c (make_frame_without_minibuffer, make_minibuffer_frame)

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-08-13 03:44:27 +0000
+++ b/src/keyboard.c    2012-08-14 12:11:59 +0000
@@ -8836,7 +8836,7 @@
   /* 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;

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-08-10 18:23:45 +0000
+++ b/src/lisp.h        2012-08-14 12:11:59 +0000
@@ -641,7 +641,7 @@
 
 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)