summaryrefslogtreecommitdiff
path: root/src/os_msdos.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-06-19 01:14:29 +0200
committerBram Moolenaar <Bram@vim.org>2011-06-19 01:14:29 +0200
commitd44347f1e7791ead2d90b1fda06d9f4e325d912e (patch)
treed00df322e29d233a3845b5c12c3973375dc4a073 /src/os_msdos.c
parent19e609437873594b8b08aaceafbe81ef235044bf (diff)
downloadvim-git-d44347f1e7791ead2d90b1fda06d9f4e325d912e.tar.gz
updated for version 7.3.221v7.3.221
Problem: Text from the clipboard is sometimes handled as linewise, but not consistently. Solution: Assume the text is linewise when it ends in a CR or NL.
Diffstat (limited to 'src/os_msdos.c')
-rw-r--r--src/os_msdos.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/os_msdos.c b/src/os_msdos.c
index 1b52d72c4..3449d23b9 100644
--- a/src/os_msdos.c
+++ b/src/os_msdos.c
@@ -2232,7 +2232,7 @@ clip_mch_lose_selection(VimClipboard *cbd)
void
clip_mch_request_selection(VimClipboard *cbd)
{
- int type = MCHAR;
+ int type = MAUTO;
char_u *pAllocated = NULL;
char_u *pClipText = NULL;
int clip_data_format = 0;
@@ -2280,14 +2280,12 @@ clip_mch_request_selection(VimClipboard *cbd)
{
clip_data_format = CF_TEXT;
pClipText = pAllocated;
- type = (vim_strchr((char*)pClipText, '\r') != NULL) ? MLINE : MCHAR;
}
else if ((pAllocated = Win16GetClipboardData(CF_OEMTEXT)) != NULL)
{
clip_data_format = CF_OEMTEXT;
pClipText = pAllocated;
- type = (vim_strchr((char*)pClipText, '\r') != NULL) ? MLINE : MCHAR;
}
/* Did we get anything? */