From: Bram Moolenaar Date: Wed, 26 Oct 2011 09:36:25 +0000 (+0200) Subject: updated for version 7.3.347 X-Git-Tag: v7.3.347 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b931d74b060461c47008aba7b3eb6a9ab1471c69;p=thirdparty%2Fvim.git updated for version 7.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. --- 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 @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 347, /**/ 346, /**/