diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-11-09 14:05:09 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-11-09 14:05:09 +0000 |
| commit | 10f1c62257f431289b7a2662a50c7709cbc8f9c1 (patch) | |
| tree | 79d1aece9478cb7892a734f744a961556fceeec6 | |
| parent | Add patch for bug 292007. (diff) | |
| download | emacs-patches-10f1c62257f431289b7a2662a50c7709cbc8f9c1.tar.gz emacs-patches-10f1c62257f431289b7a2662a50c7709cbc8f9c1.tar.bz2 emacs-patches-10f1c62257f431289b7a2662a50c7709cbc8f9c1.zip | |
Add patch for bug 292492.emacs-23.1-patches-3emacs-22.3-patches-3
| -rw-r--r-- | emacs/22.3/06_all_xterm-undef-ref.patch | 22 | ||||
| -rw-r--r-- | emacs/23.1/04_all_xterm-undef-ref.patch | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/emacs/22.3/06_all_xterm-undef-ref.patch b/emacs/22.3/06_all_xterm-undef-ref.patch new file mode 100644 index 0000000..62679f2 --- /dev/null +++ b/emacs/22.3/06_all_xterm-undef-ref.patch @@ -0,0 +1,22 @@ +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/04_all_xterm-undef-ref.patch b/emacs/23.1/04_all_xterm-undef-ref.patch new file mode 100644 index 0000000..d651c93 --- /dev/null +++ b/emacs/23.1/04_all_xterm-undef-ref.patch @@ -0,0 +1,22 @@ +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. */ |