(Qsuper): Remove.

(parse_menu_item): Don't call where_is_internal specially for NS.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8228011662d3f42c5bf6621e3ff644cf337d6477..5f3799785da9119d181e6ae134877839950b1bcc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/keyboard.c b/src/keyboard.c
index f6ec7671904dbf4ba0ebd5f239740234a0f77e75..0ae24b70abb63061fc38537a67c37cfad804a018 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -82,7 +82,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_NS
 #include "nsterm.h"
-extern Lisp_Object Qsuper;
 #endif
 
 #ifndef USE_CRT_DLL
@@ -8065,12 +8064,7 @@ parse_menu_item (item, notreal, inmenubar)
              && 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))
            {