1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 11:37:32 +03:00

Merge branch 'issue/337-initvim' into develop

This commit is contained in:
Tae Won Ha 2016-11-13 15:00:00 +01:00
commit 78a6725bf7
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
2 changed files with 3 additions and 8 deletions

View File

@ -592,6 +592,9 @@ void server_start_neovim() {
NSString *runtimePath = [resourcesPath stringByAppendingPathComponent:@"runtime"];
setenv("VIMRUNTIME", runtimePath.fileSystemRepresentation, true);
// Set $LANG to en_US.UTF-8 such that the copied text to the system clipboard is not garbled.
setenv("LANG", "en_US.UTF-8", true);
uv_mutex_init(&_mutex);
uv_cond_init(&_condition);

View File

@ -129,14 +129,6 @@ static CFDataRef local_server_callback(CFMessagePortRef local, SInt32 msgid, CFD
_neoVimServerTask.standardError = nullFileHandle;
#endif
// Set $LANG to en_US.UTF-8 such that the copied text to the system clipboard is not garbled.
NSMutableDictionary<NSString *, NSString *> *environment = _neoVimServerTask.environment.mutableCopy;
if (environment == nil) {
environment = NSMutableDictionary.new;
}
environment[@"LANG"] = @"en_US.UTF-8";
_neoVimServerTask.environment = environment;
_neoVimServerTask.standardInput = inputPipe;
_neoVimServerTask.currentDirectoryPath = NSHomeDirectory();
_neoVimServerTask.launchPath = shellPath;