aboutsummaryrefslogtreecommitdiffstats
path: root/editors/emacs23
diff options
context:
space:
mode:
authorbsam <bsam@FreeBSD.org>2010-03-16 00:53:49 +0800
committerbsam <bsam@FreeBSD.org>2010-03-16 00:53:49 +0800
commit95af26ca4ae648345b996a1cb9795f6824414d48 (patch)
treee1e2ca0a674b541d17ad1291d0aa51f518c19cf5 /editors/emacs23
parenta2ee7512088c89e0a311ebd5d47578f73adb7fca (diff)
downloadfreebsd-ports-gnome-95af26ca4ae648345b996a1cb9795f6824414d48.tar.gz
freebsd-ports-gnome-95af26ca4ae648345b996a1cb9795f6824414d48.tar.zst
freebsd-ports-gnome-95af26ca4ae648345b996a1cb9795f6824414d48.zip
. items in emacs 23.1/GTK menus don't get updated, fix it; [1]
. bump PORTREVISION. PR: ports/144309 [1] Submitted by: Robert Jenssen <robertjenssen@ozemail.com.au> [1] Approved by: keramida@ceid.upatras.gr (maintainer timeout, 17 days)
Diffstat (limited to 'editors/emacs23')
-rw-r--r--editors/emacs23/Makefile2
-rw-r--r--editors/emacs23/files/patch-src-xfns.c30
2 files changed, 31 insertions, 1 deletions
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index f71c6880b3b3..0af44e0724e3 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
diff --git a/editors/emacs23/files/patch-src-xfns.c b/editors/emacs23/files/patch-src-xfns.c
new file mode 100644
index 000000000000..16415d515a53
--- /dev/null
+++ b/editors/emacs23/files/patch-src-xfns.c
@@ -0,0 +1,30 @@
+--- src/xfns.c.orig 2009-08-31 00:03:02.000000000 +0100
++++ 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;