Mercurial > emacs
changeset 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 | e7299e988a36 |
| children | 05ebabb317e3 |
| files | src/ChangeLog src/keyboard.c |
| diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 16 15:52:24 2008 +0000 +++ b/src/ChangeLog Wed Jul 16 16:38:33 2008 +0000 @@ -1,3 +1,8 @@ +2008-07-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * keyboard.c (Qsuper): Remove. + (parse_menu_item): Don't call where_is_internal specially for NS. + 2008-07-16 Dan Nicolaescu <dann@ics.uci.edu> * s/gnu-linux.h: Remove boilerplate comments. @@ -14,7 +19,7 @@ 2008-07-16 Jason Rumney <jasonr@gnu.org> - * w32gui.h: Repeat 26 June changes lost by last change. + * w32gui.h: Repeat 26 June changes lost by last change. 2008-07-16 Dan Nicolaescu <dann@ics.uci.edu> @@ -54,8 +59,8 @@ * s/template.h: Remove comments about static. - * sysdep.c: Remove code depending on NEED_PTEM_H, unused. Remove - if 0-ed code. + * sysdep.c: Remove code depending on NEED_PTEM_H, unused. + Remove if 0-ed code. (baud_convert): Don't depend on BAUD_CONVERT, all definitions the were the same as the default. * s/vms.h (BAUD_CONVERT): Remove, same as the default.
--- a/src/keyboard.c Wed Jul 16 15:52:24 2008 +0000 +++ b/src/keyboard.c Wed Jul 16 16:38:33 2008 +0000 @@ -82,7 +82,6 @@ #ifdef HAVE_NS #include "nsterm.h" -extern Lisp_Object Qsuper; #endif #ifndef USE_CRT_DLL @@ -8065,12 +8064,7 @@ && SYMBOLP (XSYMBOL (def)->function) && ! NILP (Fget (def, Qmenu_alias))) def = XSYMBOL (def)->function; -#ifdef HAVE_NS - /* prefer 'super' bindings */ - tem = Fwhere_is_internal (def, Qnil, Qsuper, Qt, Qt); -#else tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt); -#endif XSETCAR (cachelist, tem); if (NILP (tem)) {