From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?q?=C4=B0smail_D=C3=B6nmez?= Newsgroups: gmane.emacs.devel Subject: Re: Options menu is broken on CVS Date: Thu, 8 Sep 2005 11:50:30 +0200 Organization: =?utf-8?q?UEKAE/T=C3=9CB=C4=B0TAK?= Message-ID: <200509081250.31252.ismail@uludag.org.tr> References: <200509062007.04648.ismail@uludag.org.tr> <17183.25577.926363.814486@farnswood.snap.net.nz> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_nlAID3O9x1Urrc7" X-Trace: sea.gmane.org 1126174662 29923 80.91.229.2 (8 Sep 2005 10:17:42 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 8 Sep 2005 10:17:42 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 08 12:17:40 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EDJSb-0006TT-LM for ged-emacs-devel@m.gmane.org; Thu, 08 Sep 2005 12:16:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EDJSa-0002PA-S0 for ged-emacs-devel@m.gmane.org; Thu, 08 Sep 2005 06:16:48 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EDJ6U-00046b-5R for emacs-devel@gnu.org; Thu, 08 Sep 2005 05:53:58 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EDJ6R-00044f-BP for emacs-devel@gnu.org; Thu, 08 Sep 2005 05:53:56 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EDJ6Q-000401-Nm for emacs-devel@gnu.org; Thu, 08 Sep 2005 05:53:54 -0400 Original-Received: from [193.140.100.220] (helo=uludag.org.tr) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1EDJ7f-0001WL-Qg for emacs-devel@gnu.org; Thu, 08 Sep 2005 05:55:12 -0400 Original-Received: from dsl.dynamic81213107220.ttnet.net.tr (unknown [81.213.107.220]) by uludag.org.tr (Postfix) with ESMTP id E935B75A00 for ; Thu, 8 Sep 2005 12:50:33 +0300 (EEST) Original-To: emacs-devel@gnu.org User-Agent: KMail/1.8.1 In-Reply-To: <17183.25577.926363.814486@farnswood.snap.net.nz> X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:42749 Archived-At: --Boundary-00=_nlAID3O9x1Urrc7 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Per=C5=9Fembe 08 Eyl=C3=BCl 2005 01:04 tarihinde =C5=9Funlar=C4=B1 yazm=C4= =B1=C5=9Ft=C4=B1n=C4=B1z: > > Please don't take out this change without understanding what it was > > fixing in the first place. > > I think this is the right fix. Actually I think the problem was caused by > Kim's change: > Your patch fixes the problem for me. I attached a diff -u version of it in= =20 case someone wants to apply it too. Regards, ismail --Boundary-00=_nlAID3O9x1Urrc7 Content-Type: text/x-diff; charset="Iso-8859-1"; name="menu.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="menu.diff" Index: src/Makefile.in =================================================================== RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v retrieving revision 1.313 diff -u -r1.313 Makefile.in --- src/Makefile.in 7 Aug 2005 12:33:16 -0000 1.313 +++ src/Makefile.in 8 Sep 2005 09:48:31 -0000 @@ -304,15 +304,15 @@ #define LIB_X11_LIB -lX11 #endif +#ifndef HAVE_CARBON +XMENU_OBJ = xmenu.o +#endif + #ifdef HAVE_X_WINDOWS XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o #ifdef HAVE_MENUS - -#ifndef HAVE_CARBON -XMENU_OBJ = xmenu.o -#endif #ifdef USE_GTK GTK_OBJ= gtkutil.o Index: src/emacs.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/emacs.c,v retrieving revision 1.374 diff -u -r1.374 emacs.c --- src/emacs.c 27 Aug 2005 12:23:22 -0000 1.374 +++ src/emacs.c 8 Sep 2005 09:48:44 -0000 @@ -1624,12 +1624,10 @@ #endif #endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_MENUS #ifndef HAVE_NTGUI #ifndef MAC_OS /* Called before init_window_once for Mac OS Classic. */ syms_of_xmenu (); -#endif #endif #endif --Boundary-00=_nlAID3O9x1Urrc7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --Boundary-00=_nlAID3O9x1Urrc7--