summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-15 15:40:33 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-15 15:40:33 +0200
commitf6dcbb245b3d808a5d812ac66ce6ca701b1991f2 (patch)
tree44b15aea43fabb388487e70453790f84d9ed9f8c
parentf8de161090c9075973bb6e75f88a303d7aa1ddfc (diff)
downloadvim-f6dcbb245b3d808a5d812ac66ce6ca701b1991f2.zip
updated for version 7.3.900
Problem: Not obvious that some mouse features are mutual-exclusive. Solution: Add a comment.
-rw-r--r--src/feature.h7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/feature.h b/src/feature.h
index 434c07f41..330a74868 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1088,6 +1088,13 @@
# endif
#endif
+/*
+ * Note: Only one of the following may be defined:
+ * FEAT_MOUSE_GPM
+ * FEAT_SYSMOUSE
+ * FEAT_MOUSE_JSB
+ * FEAT_MOUSE_PTERM
+ */
#if defined(FEAT_NORMAL) && defined(HAVE_GPM)
# define FEAT_MOUSE_GPM
#endif
diff --git a/src/version.c b/src/version.c
index 4a5a0be90..9884bf912 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 900,
+/**/
899,
/**/
898,