Index: emacs23.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs23.info,v
retrieving revision 1.4
diff -a -u -r1.4 emacs23.info
--- emacs23.info	18 Sep 2009 09:53:29 -0000	1.4
+++ emacs23.info	19 Apr 2010 20:05:30 -0000
@@ -57,7 +57,7 @@
 Source: mirror:gnu:emacs/emacs-%v.tar.gz
 Source-MD5: a620d4452769d04ad8864d662f34f8dd
 PatchFile: emacs23.patch
-PatchFile-MD5: b7d9ab3ff299adb86898526a3bbf131a
+PatchFile-MD5: 7c95c8d10cf4251f582f61795a0aee13
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 -I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
Index: emacs23.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs23.patch,v
retrieving revision 1.2
diff -a -u -r1.2 emacs23.patch
--- emacs23.patch	3 Sep 2009 21:11:56 -0000	1.2
+++ emacs23.patch	19 Apr 2010 20:05:30 -0000
@@ -10,6 +10,15 @@
  
  gameuser=games
  
+@@ -10942,7 +10942,7 @@
+ HAVE_GTK=no
+ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
+   GLIB_REQUIRED=2.6
+-  GTK_REQUIRED=2.6
++  GTK_REQUIRED=2.17.9
+   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
+ 
+ 
 @@ -14610,9 +14610,9 @@
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
@@ -186,3 +195,33 @@
  #endif
  
  /* The ncurses library has been moved out of the System framework in
+--- emacs-23.1/src/xfns.c	2009-08-31 00:03:02.000000000 +0100
++++ emacs-23.1.patched/src/xfns.c	2009-08-31 00:21:39.000000000 +0100
+@@ -468,8 +468,10 @@
+       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+ 	continue;
+       x = f->output_data.x;
+-      /* Match if the window is this frame's menubar.  */
+ #ifdef USE_GTK
++      /* Match if the window is this frame's window (button presses are no longer
++         caught by the menubar) or a menu in the menubar.
++       */
+       if (x->menubar_widget)
+         {
+           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+@@ -477,13 +479,14 @@
+ 
+           BLOCK_INPUT;
+           if (gwdesc != 0
+-              && (gwdesc == x->menubar_widget
++              && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
+                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
+             found = 1;
+           UNBLOCK_INPUT;
+           if (found) return f;
+         }
+ #else
++      /* Match if the window is in this frame's menubar */
+       if (x->menubar_widget
+ 	  && lw_window_is_in_menubar (wdesc, x->menubar_widget))
+ 	return f;