diff options
author | Miles Bader <miles@gnu.org> | 2007-06-16 22:33:42 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-06-16 22:33:42 +0000 |
commit | 262d5ce7c21d6c1136fd2b8df67736e41e8e8953 (patch) | |
tree | 853a5d30babd0abd585ccbe7f4e228bf43a42d5c /src/xmenu.c | |
parent | 5534694247d2b5259325ff43af0624aa2f8abb3e (diff) | |
parent | af41f8a8d6660ad1fefad5bda69d1acb8e40b4d1 (diff) | |
download | emacs-262d5ce7c21d6c1136fd2b8df67736e41e8e8953.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 793-802)
- Update from CVS
- Remove RCS keywords
- Merge from emacs--rel--22
* emacs--rel--22 (patch 42-50)
- Update from CVS
- Merge from gnus--rel--5.10
- Gnus ChangeLog tweaks
* gnus--rel--5.10 (patch 229-232)
- Merge from emacs--devo--0, emacs--rel--22
- ChangeLog tweak
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
Diffstat (limited to 'src/xmenu.c')
-rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 4390d9429af..a9e0d4be001 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -82,7 +82,11 @@ Boston, MA 02110-1301, USA. */ #include <X11/StringDefs.h> #include <X11/Shell.h> #ifdef USE_LUCID +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> +#endif /* HAVE_XAW3D */ #endif /* USE_LUCID */ #include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ |