| 1 |
ulm 10/01/26 19:36:42 |
| 2 |
|
| 3 |
Modified: 03_all_gtk-menu.patch |
| 4 |
Removed: 04_all_xterm-undef-ref.patch |
| 5 |
Log: |
| 6 |
Combine related patches for bugs 292007 and 292492 into one. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 src/patchsets/emacs/23.1/03_all_gtk-menu.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/emacs/23.1/03_all_gtk-menu.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/emacs/23.1/03_all_gtk-menu.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/emacs/23.1/03_all_gtk-menu.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 03_all_gtk-menu.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/emacs/23.1/03_all_gtk-menu.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 03_all_gtk-menu.patch 8 Nov 2009 22:42:11 -0000 1.1 |
| 22 |
+++ 03_all_gtk-menu.patch 26 Jan 2010 19:36:41 -0000 1.2 |
| 23 |
@@ -1,5 +1,7 @@ |
| 24 |
http://bugs.gentoo.org/292007 |
| 25 |
http://emacsbugs.donarmstrong.com/4122 |
| 26 |
+http://bugs.gentoo.org/292492 |
| 27 |
+http://emacsbugs.donarmstrong.com/4336 |
| 28 |
Fix updating of menus with GTK+ 2.18 |
| 29 |
Patch by Jan Djärv <jan.h.d@×××××××.se>, backported from upstream CVS |
| 30 |
|
| 31 |
@@ -148,12 +150,19 @@ |
| 32 |
/* If we end up with the menu bar window, say it's not |
| 33 |
--- emacs-23.1-orig/src/xterm.h |
| 34 |
+++ emacs-23.1/src/xterm.h |
| 35 |
-@@ -374,7 +374,7 @@ |
| 36 |
+@@ -372,10 +372,13 @@ |
| 37 |
|
| 38 |
- #if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 39 |
+ extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); |
| 40 |
+ |
| 41 |
+-#if defined (USE_X_TOOLKIT) || defined (USE_GTK) |
| 42 |
extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); |
| 43 |
-extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); |
| 44 |
+extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); |
| 45 |
extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); |
| 46 |
++ |
| 47 |
++#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
| 48 |
++#define x_any_window_to_frame x_window_to_frame |
| 49 |
++#define x_top_window_to_frame x_window_to_frame |
| 50 |
#endif |
| 51 |
|
| 52 |
+ /* This is a chain of structures for all the X displays currently in use. */ |
Archives