Mercurial > emacs

changeset 109496:bf6283e6c0a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS".
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 23 Jul 2010 12:32:02 +0200
parents 2899bda31dbe
children c40b94d7d47b 35be6b7aa0ff
files src/ChangeLog src/menu.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jul 23 12:09:27 2010 +0200
+++ b/src/ChangeLog	Fri Jul 23 12:32:02 2010 +0200
@@ -1,5 +1,8 @@
 2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
 
+	* menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS";
+	it is called only from NS code.
+
 	* w32term.c (my_set_focus): #ifdef away; it is called only from
 	"#ifdef 0" code.
 
--- a/src/menu.c	Fri Jul 23 12:09:27 2010 +0200
+++ b/src/menu.c	Fri Jul 23 12:32:02 2010 +0200
@@ -133,12 +133,14 @@
   xassert (NILP (menu_items_inuse));
 }
 
+#ifdef HAVE_NS
 static Lisp_Object
 cleanup_popup_menu (Lisp_Object arg)
 {
   discard_menu_items ();
   return Qnil;
 }
+#endif
 
 /* This undoes save_menu_items, and it is called by the specpdl unwind
    mechanism.  */