From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Richard M. Stallman" Newsgroups: gmane.emacs.devel Subject: Re: Options menu is broken on CVS Date: Mon, 12 Sep 2005 11:34:23 -0400 Message-ID: References: <200509062007.04648.ismail@uludag.org.tr> <17181.65500.337376.386116@farnswood.snap.net.nz> <200509062349.18090.ismail@uludag.org.tr> <17182.8135.530028.132576@farnswood.snap.net.nz> <17183.25577.926363.814486@farnswood.snap.net.nz> <17183.48402.585456.467736@farnswood.snap.net.nz> Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1126540098 22814 80.91.229.2 (12 Sep 2005 15:48:18 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 12 Sep 2005 15:48:18 +0000 (UTC) Cc: nickrob@snap.net.nz, mituharu@math.s.chiba-u.ac.jp, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 12 17:48:08 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EEqUU-0000kw-1B for ged-emacs-devel@m.gmane.org; Mon, 12 Sep 2005 17:45:06 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EEqUT-0006rq-9G for ged-emacs-devel@m.gmane.org; Mon, 12 Sep 2005 11:45:05 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EEqOl-0004Qa-Jp for emacs-devel@gnu.org; Mon, 12 Sep 2005 11:39:11 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EEqOi-0004PD-TX for emacs-devel@gnu.org; Mon, 12 Sep 2005 11:39:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EEqOg-0004Gy-EQ for emacs-devel@gnu.org; Mon, 12 Sep 2005 11:39:06 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EEqL6-0007xD-N0 for emacs-devel@gnu.org; Mon, 12 Sep 2005 11:35:24 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34) id 1EEqK7-00086V-Pa; Mon, 12 Sep 2005 11:34:23 -0400 Original-To: Eli Zaretskii In-reply-to: (message from Eli Zaretskii on Sun, 11 Sep 2005 22:51:48 +0300) 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:42843 Archived-At: I have no idea if this will work without some non-trivial re-shuffling of the code in x-popup-menu. Just looking at the source, it seems to invoke functions that need X (or its emulation). Someone will have to work on refactoring the code before we can do what you suggest. The following changes seem to be enough to make x-popup-menu compile and link properly. And the keyboard shortcuts do appear. Note that no change was needed in xmenu.c itself. Apparently someone already prepared that file for such use. *** emacs.c 27 Aug 2005 22:41:25 -0400 1.374 --- emacs.c 12 Sep 2005 07:28:32 -0400 *************** *** 1624,1635 **** #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 --- 1624,1633 ---- *** Makefile.in 07 Aug 2005 13:30:34 -0400 1.313 --- Makefile.in 12 Sep 2005 07:37:47 -0400 *************** *** 310,319 **** #ifdef HAVE_MENUS - #ifndef HAVE_CARBON - XMENU_OBJ = xmenu.o - #endif - #ifdef USE_GTK GTK_OBJ= gtkutil.o #endif --- 310,315 ---- *************** *** 449,457 **** LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #endif /* not HAVE_X11 */ #else /* not HAVE_X_WINDOWS */ - #if defined(HAVE_MENUS) && !defined(HAVE_CARBON) - XMENU_OBJ = xmenu.o - #endif #endif /* not HAVE_X_WINDOWS */ LIBSOUND= @LIBSOUND@ --- 445,450 ---- *************** *** 577,583 **** /* 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 $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o \ cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \ --- 570,576 ---- /* 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 xmenu.o window.o \ charset.o coding.o category.o ccl.o \ cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \ *************** *** 596,602 **** These go in the DOC file on all machines in case they are needed there. */ SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ ! xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o --- 589,595 ---- These go in the DOC file on all machines in case they are needed there. */ SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ ! xterm.o xfns.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o *** xdisp.c 08 Sep 2005 20:35:28 -0400 1.1050 --- xdisp.c 12 Sep 2005 07:22:30 -0400 *************** *** 10009,10020 **** --- 10009,10022 ---- if (FRAME_WINDOW_P (it->f) && WINDOW_LEFT_FRINGE_WIDTH (it->w) > 0) { + #ifdef HAVE_WINDOW_SYSTEM if (val = Fget (var, Qoverlay_arrow_bitmap), SYMBOLP (val)) { int fringe_bitmap; if ((fringe_bitmap = lookup_fringe_bitmap (val)) != 0) return make_number (fringe_bitmap); } + #endif return make_number (-1); /* Use default arrow bitmap */ } return overlay_arrow_string_or_property (var);