From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 5 Sep 2013 08:33:03 +0000 (+0300)
Subject: Made HAVE_MENUS the default; comment fix in term.c.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1328^2~54
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50a5f95ec5e610e8edbe09b03388c83684d87fd7;p=emacs.git

Made HAVE_MENUS the default; comment fix in term.c.
---

diff --git a/configure.ac b/configure.ac
index cfec49e5645..1e650105244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1836,11 +1836,8 @@ to configure.])
    fi
 fi
 
-### If we're using X11, we should use the X menu package.
-HAVE_MENUS=no
-case ${HAVE_X11} in
-  yes ) HAVE_MENUS=yes ;;
-esac
+### We always support menus.
+HAVE_MENUS=yes
 
 # Does the opsystem file prohibit the use of the GNU malloc?
 # Assume not, until told otherwise.
@@ -3122,15 +3119,9 @@ if test "${HAVE_NS}" = "yes"; then
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
-  # We also have mouse menus.
-  HAVE_MENUS=yes
   OTHER_FILES=ns-app
 fi
 
-if test "${HAVE_W32}" = "yes"; then
-  HAVE_MENUS=yes
-fi
-
 ### Use session management (-lSM -lICE) if available
 HAVE_X_SM=no
 LIBXSM=
@@ -4609,9 +4600,7 @@ AC_SUBST(OLDXMENU_DEPS)
 
 if test "${HAVE_MENUS}" = "yes" ; then
   AC_DEFINE(HAVE_MENUS, 1,
-	    [Define to 1 if you have mouse menus.
-	     (This is automatic if you use X, but the option to specify it remains.)
-	     It is also defined with other window systems that support xmenu.c.])
+	    [Define to 1 if you have mouse menus.  (This is supported in all configurations, but the option to specify it remains.)])
 fi
 
 if test "${GNU_MALLOC}" = "yes" ; then
diff --git a/src/term.c b/src/term.c
index 73d7585e8f5..806e038da9a 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3227,7 +3227,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
 				  faces[1], 1);
 
   /* Make sure the menu title is always displayed with
-     `msdos-menu-active-face', no matter where the mouse pointer is.  */
+     `tty-menu-selected-face', no matter where the mouse pointer is.  */
   for (i = 0; i < 4; i++)
     title_faces[i] = faces[3];