Mercurial > emacs
changeset 95655:9a50a852d447
* Makefile.in (obj): Always add menu.o
* emacs.c (main): Always call syms_of_menu.
* keyboard.h: Remove extra #ifdef HAVE_X_WINDOW.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 08 Jun 2008 08:59:47 +0000 |
| parents | 007178a22142 |
| children | 32785fc68f99 |
| files | src/ChangeLog src/Makefile.in src/emacs.c src/keyboard.h |
| diffstat | 4 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jun 08 07:54:25 2008 +0000 +++ b/src/ChangeLog Sun Jun 08 08:59:47 2008 +0000 @@ -1,3 +1,9 @@ +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.
--- a/src/Makefile.in Sun Jun 08 07:54:25 2008 +0000 +++ b/src/Makefile.in Sun Jun 08 08:59:47 2008 +0000 @@ -539,13 +539,9 @@ #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 \
--- a/src/emacs.c Sun Jun 08 07:54:25 2008 +0000 +++ b/src/emacs.c Sun Jun 08 08:59:47 2008 +0000 @@ -1607,9 +1607,7 @@ #endif #endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_X_WINDOWS syms_of_menu (); -#endif #ifndef HAVE_NTGUI #ifndef MAC_OS
--- a/src/keyboard.h Sun Jun 08 07:54:25 2008 +0000 +++ b/src/keyboard.h Sun Jun 08 08:59:47 2008 +0000 @@ -253,8 +253,6 @@ /* 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 @@ 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 @@ #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. */