summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-10-26 11:36:25 +0200
committerBram Moolenaar <bram@vim.org>2011-10-26 11:36:25 +0200
commit59d3fe46b4a8e02c11e735649592028dd938bd6a (patch)
tree5b1e37b3f11ac9d2fb5edc9a4ce96fe855b6c84e
parentc2b1c0fb51583da9002830ec57861e65785d44c1 (diff)
downloadvim-7.3.347.tar.gz
updated for version 7.3.347v7.3.347v7-3-347
Problem: When dropping text from a browser on Vim it receives HTML even though "html" is excluded from 'clipboard'. (Andrei Avk) Solution: Fix the condition for TARGET_HTML.
-rw-r--r--src/gui_gtk_x11.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index e2f9fc5b..09126094 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3081,7 +3081,7 @@ gui_gtk_set_dnd_targets(void)
for (i = 0; i < (int)N_DND_TARGETS; ++i)
{
- if (!clip_html && selection_targets[i].info == TARGET_HTML)
+ if (!clip_html && dnd_targets[i].info == TARGET_HTML)
n_targets--;
else
targets[j++] = dnd_targets[i];
diff --git a/src/version.c b/src/version.c
index 80c2460b..7c966e54 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 347,
+/**/
346,
/**/
345,