address@hidden: Build error around new function `Fmenu_or_popup_active_p']

[Richard Stallman]

Please install this.

------- Start of forwarded message -------
To: address@hidden
From: Shun-ichi GOTO <address@hidden>
Date: Mon, 06 Nov 2006 18:06:22 +0900
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Subject: Build error around new function `Fmenu_or_popup_active_p'
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=failed 
        version=3.0.4

On cvs head, new function Fmenu_or_popup_active_p in xmenu.c is added

  revision 1.312
  date: 2006-11-05 12:18:47 +0000;  author: eliz;  state: Exp;  lines: +10 -0
  (Fmenu_or_popup_active_p): New function.
  (syms_of_xmenu): Defsubr it.

The defun part is in condition HAVE_MENU but registration part in
syms_of_xmenu() is out of HAVE_MENU condition.
It cause compilation error on non-X-Window environment.

Here is a patch.

*** xmenu.c.~1.313.~    Mon Nov  6 11:35:52 2006
- --- xmenu.c     Mon Nov  6 17:50:25 2006
***************
*** 3787,3793 ****
  #endif

    defsubr (&Sx_popup_menu);
- -   defsubr (&Smenu_or_popup_active_p);

  #if defined (USE_GTK) || defined (USE_X_TOOLKIT)
    defsubr (&Smenu_bar_open);
- --- 3787,3792 ----
***************
*** 3796,3801 ****
- --- 3795,3801 ----

  #ifdef HAVE_MENUS
    defsubr (&Sx_popup_dialog);
+   defsubr (&Smenu_or_popup_active_p);
  #endif
  }


- --- Regards,
 Shun-ichi Goto  <address@hidden>
   R&D Group, TAIYO Corp., Tokyo, JAPAN




_______________________________________________
emacs-pretest-bug mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug
------- End of forwarded message -------