diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-01-26 19:36:41 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-01-26 19:36:41 +0000 |
| commit | c80ff37a7f1d5375ace48260a84a141c22d3305d (patch) | |
| tree | 60bbf2951762be4118d214601732061595dbeff7 | |
| parent | Install manpage for emacsclient, bug 165466. (diff) | |
| download | emacs-patches-c80ff37a7f1d5375ace48260a84a141c22d3305d.tar.gz emacs-patches-c80ff37a7f1d5375ace48260a84a141c22d3305d.tar.bz2 emacs-patches-c80ff37a7f1d5375ace48260a84a141c22d3305d.zip | |
Combine related patches for bugs 292007 and 292492 into one.
| -rw-r--r-- | emacs/22.3/05_all_gtk-menu.patch | 13 | ||||
| -rw-r--r-- | emacs/22.3/06_all_xterm-undef-ref.patch | 22 | ||||
| -rw-r--r-- | emacs/23.1/03_all_gtk-menu.patch | 13 | ||||
| -rw-r--r-- | emacs/23.1/04_all_xterm-undef-ref.patch | 22 |
4 files changed, 22 insertions, 48 deletions
diff --git a/emacs/22.3/05_all_gtk-menu.patch b/emacs/22.3/05_all_gtk-menu.patch index efe69df..09b7c46 100644 --- a/emacs/22.3/05_all_gtk-menu.patch +++ b/emacs/22.3/05_all_gtk-menu.patch @@ -1,5 +1,7 @@ http://bugs.gentoo.org/292007 http://emacsbugs.donarmstrong.com/4122 +http://bugs.gentoo.org/292492 +http://emacsbugs.donarmstrong.com/4336 Fix updating of menus with GTK+ 2.18 Patch by Jan Djärv <jan.h.d@swipnet.se>, backported from upstream CVS @@ -148,12 +150,19 @@ Patch by Jan Djärv <jan.h.d@swipnet.se>, backported from upstream CVS /* If we end up with the menu bar window, say it's not --- emacs-22.3-orig/src/xterm.h +++ emacs-22.3/src/xterm.h -@@ -414,7 +414,7 @@ +@@ -412,10 +412,13 @@ - #if defined (USE_X_TOOLKIT) || defined (USE_GTK) + extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); + +-#if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); -extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); ++ ++#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) ++#define x_any_window_to_frame x_window_to_frame ++#define x_top_window_to_frame x_window_to_frame #endif + /* This is a chain of structures for all the X displays currently in use. */ diff --git a/emacs/22.3/06_all_xterm-undef-ref.patch b/emacs/22.3/06_all_xterm-undef-ref.patch deleted file mode 100644 index 62679f2..0000000 --- a/emacs/22.3/06_all_xterm-undef-ref.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/292492 -http://emacsbugs.donarmstrong.com/4336 -Define x_*_window_to_frame for non-toolkit. -Patch by Jan Djärv <jan.h.d@swipnet.se>, from upstream CVS - ---- emacs-22.3-orig/src/xterm.h -+++ emacs-22.3/src/xterm.h -@@ -412,10 +412,13 @@ - - extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); - --#if defined (USE_X_TOOLKIT) || defined (USE_GTK) - extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); - extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); - extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); -+ -+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) -+#define x_any_window_to_frame x_window_to_frame -+#define x_top_window_to_frame x_window_to_frame - #endif - - /* This is a chain of structures for all the X displays currently in use. */ diff --git a/emacs/23.1/03_all_gtk-menu.patch b/emacs/23.1/03_all_gtk-menu.patch index 3598bbd..ccffd0c 100644 --- a/emacs/23.1/03_all_gtk-menu.patch +++ b/emacs/23.1/03_all_gtk-menu.patch @@ -1,5 +1,7 @@ http://bugs.gentoo.org/292007 http://emacsbugs.donarmstrong.com/4122 +http://bugs.gentoo.org/292492 +http://emacsbugs.donarmstrong.com/4336 Fix updating of menus with GTK+ 2.18 Patch by Jan Djärv <jan.h.d@swipnet.se>, backported from upstream CVS @@ -148,12 +150,19 @@ Patch by Jan Djärv <jan.h.d@swipnet.se>, backported from upstream CVS /* If we end up with the menu bar window, say it's not --- emacs-23.1-orig/src/xterm.h +++ emacs-23.1/src/xterm.h -@@ -374,7 +374,7 @@ +@@ -372,10 +372,13 @@ - #if defined (USE_X_TOOLKIT) || defined (USE_GTK) + extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); + +-#if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); -extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); ++ ++#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) ++#define x_any_window_to_frame x_window_to_frame ++#define x_top_window_to_frame x_window_to_frame #endif + /* This is a chain of structures for all the X displays currently in use. */ diff --git a/emacs/23.1/04_all_xterm-undef-ref.patch b/emacs/23.1/04_all_xterm-undef-ref.patch deleted file mode 100644 index d651c93..0000000 --- a/emacs/23.1/04_all_xterm-undef-ref.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/292492 -http://emacsbugs.donarmstrong.com/4336 -Define x_*_window_to_frame for non-toolkit. -Patch by Jan Djärv <jan.h.d@swipnet.se>, from upstream CVS - ---- emacs-23.1-orig/src/xterm.h -+++ emacs-23.1/src/xterm.h -@@ -372,10 +372,13 @@ - - extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); - --#if defined (USE_X_TOOLKIT) || defined (USE_GTK) - extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); - extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); - extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); -+ -+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) -+#define x_any_window_to_frame x_window_to_frame -+#define x_top_window_to_frame x_window_to_frame - #endif - - /* This is a chain of structures for all the X displays currently in use. */ |