summaryrefslogtreecommitdiffstats
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
commitb931d74b060461c47008aba7b3eb6a9ab1471c69 (patch)
tree61a44a74ef85e02530e21e9797ea592fc707ba09
parent1514667a24c00c247d8527e9a2e12dba97ca9d85 (diff)
updated for version 7.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 e2f9fc5be0..091260942a 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 80c2460bce..7c966e54b2 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,