[SQUASH] symbol

[bpt/emacs.git] / src / keyboard.c

diff --git a/src/keyboard.c b/src/keyboard.c
index 9ab6509..b7cf362 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7923,7 +7923,7 @@ parse_menu_item (Lisp_Object item, int inmenubar)
                       (such as lmenu.el set it up), check if the
                       original command matches the cached command.  */
                    && !(SYMBOLP (def)
-                        && EQ (tem, XSYMBOL (def)->function))))
+                        && EQ (tem, SYMBOL_FUNCTION (def)))))
              keys = Qnil;
          }
 
@@ -8790,9 +8790,10 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
   /* Handle a symbol whose function definition is a keymap
      or an array.  */
   if (SYMBOLP (next) && !NILP (Ffboundp (next))
-      && (ARRAYP (XSYMBOL (next)->function)
-         || KEYMAPP (XSYMBOL (next)->function)))
-    next = Fautoload_do_load (XSYMBOL (next)->function, next, Qnil);
+      && (ARRAYP (SYMBOL_FUNCTION (next))
+         || KEYMAPP (SYMBOL_FUNCTION (next))))
+    next = Fautoload_do_load (SYMBOL_FUNCTION (next),
+                                              next, Qnil);
 
   /* If the keymap gives a function, not an
      array, then call the function with one arg and use