emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/keymap.c,v


From: Chong Yidong
Subject: [Emacs-diffs] Changes to emacs/src/keymap.c,v
Date: Mon, 11 Sep 2006 13:03:41 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/09/11 13:03:40

Index: keymap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keymap.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -b -r1.332 -r1.333
--- keymap.c    11 Sep 2006 08:52:42 -0000      1.332
+++ keymap.c    11 Sep 2006 13:03:40 -0000      1.333
@@ -1587,13 +1587,16 @@
          && XINT (Flength (pos)) == 10
          && INTEGERP (XCAR (XCDR (pos))))
        {
-         Lisp_Object map, obj;
-         obj = Fnth (make_number(4), pos);
-         map = Fget_char_property (XCAR (XCDR (pos)),
-                                   Qkeymap,
-                                   NILP (obj) ?
-                                   Fwindow_buffer (XCAR (pos))
-                                   : XCAR (obj));
+         Lisp_Object map, object;
+
+         object = Fnth (make_number(4), pos);
+
+         if (CONSP (object))
+           map = Fget_char_property (XCDR (object), Qkeymap, XCAR (object));
+         else
+           map = Fget_char_property (XCAR (XCDR (pos)), Qkeymap,
+                                     Fwindow_buffer (XCAR (pos)));
+
          if (!NILP (Fkeymapp (map)))
            {
              value = Flookup_key (map, key, accept_default);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]