summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-08-15 18:08:50 +0000
committerBram Moolenaar <Bram@vim.org>2007-08-15 18:08:50 +0000
commit70c2a63474bc0bc167e2e2cfb0f984a91f893f0d (patch)
treef696da94e3414ac1699033dc5bd122daf941fc86 /src
parent349955a20596858c4b07f235f8102fd16774de3b (diff)
downloadvim-git-70c2a63474bc0bc167e2e2cfb0f984a91f893f0d.tar.gz
updated for version 7.1-078v7.1.078
Diffstat (limited to 'src')
-rw-r--r--src/gui.c2
-rw-r--r--src/ui.c6
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui.c b/src/gui.c
index a6e765559..4516b695c 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -5117,7 +5117,7 @@ gui_handle_drop(x, y, modifiers, fnames, count)
p = vim_strsave_escaped(fnames[i], (char_u *)"\\ \t\"|");
# endif
if (p != NULL)
- add_to_input_buf(p, (int)STRLEN(p));
+ add_to_input_buf_csi(p, (int)STRLEN(p));
vim_free(p);
vim_free(fnames[i]);
}
diff --git a/src/ui.c b/src/ui.c
index 09dcb475b..5a8c37d80 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1603,8 +1603,6 @@ set_input_buf(p)
#if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \
|| defined(FEAT_XCLIPBOARD) || defined(VMS) \
|| defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) \
- || (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \
- || defined(FEAT_MENU))) \
|| defined(PROTO)
/*
* Add the given bytes to the input buffer
@@ -1630,7 +1628,9 @@ add_to_input_buf(s, len)
}
#endif
-#if (defined(FEAT_XIM) && defined(FEAT_GUI_GTK)) \
+#if ((defined(FEAT_XIM) || defined(FEAT_DND)) && defined(FEAT_GUI_GTK)) \
+ || defined(FEAT_GUI_MSWIN) \
+ || defined(FEAT_GUI_MAC) \
|| (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) \
|| (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \
|| defined(FEAT_MENU))) \
diff --git a/src/version.c b/src/version.c
index ad8f6b8b0..5f8faf875 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 */
/**/
+ 78,
+/**/
77,
/**/
76,