summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-05-13 15:22:39 +0000
committerBram Moolenaar <Bram@vim.org>2006-05-13 15:22:39 +0000
commit5fffc13406a3f95771727cdb1d87320dd8f26fdf (patch)
tree1e3e9aa82c17249d3cc345b1f05d6d96cb886a37
parentae177eb24fe45d33be83b46a5d03aa1b78a3dee0 (diff)
downloadvim-git-5fffc13406a3f95771727cdb1d87320dd8f26fdf.tar.gz
updated for version 7.0-017v7.0.017
-rw-r--r--src/gui_xmebw.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index 670e0c02e..8ae3d40c4 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -47,13 +47,13 @@
#include "gui_xmebwp.h"
/* Provide some missing wrappers, which are missed from the LessTif
- * implementation.
+ * implementation. Also missing in Motif 1.2 and earlier.
*
* We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
* pixmap will not appear in it's caches properly. We cache the interresting
* values in XmEnhancedButtonPart instead ourself.
*/
-#ifdef LESSTIF_VERSION
+#if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
# ifndef Lab_IsMenupane
# define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \
Lab_MenuType(w) == (int)XmMENU_PULLDOWN)
diff --git a/src/version.c b/src/version.c
index 195e7c07d..b3074a627 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 17,
+/**/
16,
/**/
15,