[Emacs-diffs] Changes to emacs/src/keyboard.h,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/06/08 08:59:48

Index: keyboard.h
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- keyboard.h  8 Jun 2008 04:37:01 -0000       1.84
+++ keyboard.h  8 Jun 2008 08:59:47 -0000       1.85
@@ -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.  */