Commit 01ef9d36 authored by Andreas Schwab's avatar Andreas Schwab

* Makefile.in (obj): Always add menu.o

* emacs.c (main): Always call syms_of_menu.
* keyboard.h: Remove extra #ifdef HAVE_X_WINDOW.
parent 73f60406
2008-06-08 Andreas Schwab <schwab@suse.de>
* Makefile.in (obj): Always add menu.o
* emacs.c (main): Always call syms_of_menu.
* keyboard.h: Remove extra #ifdef HAVE_X_WINDOW.
2008-06-08 Chong Yidong <cyd@stupidchicken.com>
* Makefile.in: Compile menu.c.
......
......@@ -539,13 +539,9 @@ FONT_DRIVERS = xfont.o
#endif /* HAVE_X_WINDOWS */
#endif /* HAVE_WINDOW_SYSTEM */
#ifdef HAVE_X_WINDOWS
MENU_OBJ = menu.o
#endif
/* lastfile must follow all files
whose initialized data areas should be dumped as pure by dump-emacs. */
obj= dispnew.o frame.o scroll.o xdisp.o $(MENU_OBJ) $(XMENU_OBJ) window.o \
obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
charset.o coding.o category.o ccl.o character.o chartab.o \
cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
......
......@@ -1607,9 +1607,7 @@ main (argc, argv
#endif
#endif /* HAVE_X_WINDOWS */
#ifdef HAVE_X_WINDOWS
syms_of_menu ();
#endif
#ifndef HAVE_NTGUI
#ifndef MAC_OS
......
......@@ -253,8 +253,6 @@ extern Lisp_Object item_properties;
/* Not nil if item is enabled. */
#define ITEM_PROPERTY_ENABLE 8
#ifdef HAVE_X_WINDOWS
/* This holds a Lisp vector that holds the results of decoding
the keymaps or alist-of-alists that specify a menu.
......@@ -315,7 +313,7 @@ extern Lisp_Object unuse_menu_items P_ ((Lisp_Object dummy));
isn't defined. The use of HAVE_MULTILINGUAL_MENU could probably be
confined to an extended version of this with sections of code below
using it unconditionally. */
#ifdef HAVE_X_WINDOWS
#ifndef HAVE_NTGUI
#ifdef USE_GTK
/* gtk just uses utf-8. */
# define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str)
......@@ -324,10 +322,9 @@ extern Lisp_Object unuse_menu_items P_ ((Lisp_Object dummy));
#else
#define ENCODE_MENU_STRING(str) string_make_unibyte (str)
#endif /* USE_GTK */
#elif defined (HAVE_NTGUI)
#else /* HAVE_NTGUI */
#define ENCODE_MENU_STRING(str) (str)
#endif
#endif /* HAVE_X_WINDOWS */
/* Macros for dealing with lispy events. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment