summaryrefslogtreecommitdiff
path: root/src/os_macosx.m
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-24 17:59:39 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-24 17:59:39 +0100
commit30276f2beb248557c6b33cd5418bca8b7084b0a5 (patch)
tree56f7b88712a5ffffdd10681983e70501e2e1ba58 /src/os_macosx.m
parent264b74fa545edfb92c0d7d08a02c26331cc5b168 (diff)
downloadvim-git-30276f2beb248557c6b33cd5418bca8b7084b0a5.tar.gz
patch 8.1.0811: too many #ifdefsv8.1.0811
Problem: Too many #ifdefs. Solution: Graduate FEAT_MBYTE, the final chapter.
Diffstat (limited to 'src/os_macosx.m')
-rw-r--r--src/os_macosx.m6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/os_macosx.m b/src/os_macosx.m
index 50ca361fb..3b5c35adb 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -130,18 +130,14 @@ clip_mch_request_selection(VimClipboard *cbd)
char_u *str = (char_u*)[string UTF8String];
int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-#ifdef FEAT_MBYTE
if (input_conv.vc_type != CONV_NONE)
str = string_convert(&input_conv, str, &len);
-#endif
if (str)
clip_yank_selection(motion_type, str, len, cbd);
-#ifdef FEAT_MBYTE
if (input_conv.vc_type != CONV_NONE)
vim_free(str);
-#endif
releasepool:
[pool release];
@@ -169,7 +165,6 @@ clip_mch_set_selection(VimClipboard *cbd)
/* TODO: Avoid overflow. */
int len = (int)llen;
-#ifdef FEAT_MBYTE
if (output_conv.vc_type != CONV_NONE)
{
char_u *conv_str = string_convert(&output_conv, str, &len);
@@ -179,7 +174,6 @@ clip_mch_set_selection(VimClipboard *cbd)
str = conv_str;
}
}
-#endif
if (len > 0)
{