Mercurial > emacs
comparison src/keyboard.c @ 96742:3479c744277b
(Qsuper): Remove.
(parse_menu_item): Don't call where_is_internal specially for NS.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 16 Jul 2008 16:38:33 +0000 |
parents | 38b988607823 |
children | ebf3bd5f0017 |
comparison
equal
deleted
inserted
replaced
96741:e7299e988a36 | 96742:3479c744277b |
---|---|
80 #include "macterm.h" | 80 #include "macterm.h" |
81 #endif | 81 #endif |
82 | 82 |
83 #ifdef HAVE_NS | 83 #ifdef HAVE_NS |
84 #include "nsterm.h" | 84 #include "nsterm.h" |
85 extern Lisp_Object Qsuper; | |
86 #endif | 85 #endif |
87 | 86 |
88 #ifndef USE_CRT_DLL | 87 #ifndef USE_CRT_DLL |
89 extern int errno; | 88 extern int errno; |
90 #endif | 89 #endif |
8063 makes lmenu menus slow. */ | 8062 makes lmenu menus slow. */ |
8064 if (SYMBOLP (def) | 8063 if (SYMBOLP (def) |
8065 && SYMBOLP (XSYMBOL (def)->function) | 8064 && SYMBOLP (XSYMBOL (def)->function) |
8066 && ! NILP (Fget (def, Qmenu_alias))) | 8065 && ! NILP (Fget (def, Qmenu_alias))) |
8067 def = XSYMBOL (def)->function; | 8066 def = XSYMBOL (def)->function; |
8068 #ifdef HAVE_NS | |
8069 /* prefer 'super' bindings */ | |
8070 tem = Fwhere_is_internal (def, Qnil, Qsuper, Qt, Qt); | |
8071 #else | |
8072 tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt); | 8067 tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt); |
8073 #endif | |
8074 XSETCAR (cachelist, tem); | 8068 XSETCAR (cachelist, tem); |
8075 if (NILP (tem)) | 8069 if (NILP (tem)) |
8076 { | 8070 { |
8077 XSETCDR (cachelist, Qnil); | 8071 XSETCDR (cachelist, Qnil); |
8078 chkcache = 0; | 8072 chkcache = 0; |