From 0b018a58364c71bd751b6fa08624743553df6477 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Wed, 24 Sep 2008 20:19:24 +0200
Subject: [PATCH] Use -[NSString vimStringSave]

---
 src/MacVim/MMBackend.m  | 30 ++++--------------------------
 src/MacVim/gui_macvim.m | 18 ++----------------
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
index ae4064f56c..1fb0ad2ffd 100644
--- a/src/MacVim/MMBackend.m
+++ b/src/MacVim/MMBackend.m
@@ -695,16 +695,8 @@ static NSString *MMSymlinkWarningString =
 
         [self waitForDialogReturn];
 
-        if (dialogReturn && [dialogReturn isKindOfClass:[NSString class]]) {
-            char_u *ret = (char_u*)[dialogReturn UTF8String];
-#ifdef FEAT_MBYTE
-            ret = CONVERT_FROM_UTF8(ret);
-#endif
-            s = vim_strsave(ret);
-#ifdef FEAT_MBYTE
-            CONVERT_FROM_UTF8_FREE(ret);
-#endif
-        }
+        if (dialogReturn && [dialogReturn isKindOfClass:[NSString class]])
+            s = [dialogReturn vimStringSave];
 
         [dialogReturn release];  dialogReturn = nil;
     }
@@ -1241,15 +1233,8 @@ static NSString *MMSymlinkWarningString =
             //[svrConn setReplyTimeout:MMReplyTimeout];
             [svrConn setRootObject:self];
 
-            char_u *s = (char_u*)[svrName UTF8String];
-#ifdef FEAT_MBYTE
-            s = CONVERT_FROM_UTF8(s);
-#endif
             // NOTE: 'serverName' is a global variable
-            serverName = vim_strsave(s);
-#ifdef FEAT_MBYTE
-            CONVERT_FROM_UTF8_FREE(s);
-#endif
+            serverName = [svrName vimStringSave];
 #ifdef FEAT_EVAL
             set_vim_var_string(VV_SEND_SERVER, serverName, -1);
 #endif
@@ -1301,14 +1286,7 @@ static NSString *MMSymlinkWarningString =
             NSString *eval = [proxy evaluateExpression:string client:self];
             if (reply) {
                 if (eval) {
-                    char_u *r = (char_u*)[eval UTF8String];
-#ifdef FEAT_MBYTE
-                    r = CONVERT_FROM_UTF8(r);
-#endif
-                    *reply = vim_strsave(r);
-#ifdef FEAT_MBYTE
-                    CONVERT_FROM_UTF8_FREE(r);
-#endif
+                    *reply = [eval vimStringSave];
                 } else {
                     *reply = vim_strsave((char_u*)_(e_invexprmsg));
                 }
diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
index 67ddd5b7db..9b9f20190e 100644
--- a/src/MacVim/gui_macvim.m
+++ b/src/MacVim/gui_macvim.m
@@ -1750,14 +1750,7 @@ serverGetVimNames(void)
 
     if (list) {
         NSString *string = [list componentsJoinedByString:@"\n"];
-        char_u *s = (char_u*)[string UTF8String];
-#ifdef FEAT_MBYTE
-        s = CONVERT_FROM_UTF8(s);
-#endif
-        names = vim_strsave(s);
-#ifdef FEAT_MBYTE
-        CONVERT_FROM_UTF8_FREE(s);
-#endif
+        names = [string vimStringSave];
     }
 
     return names;
@@ -1825,14 +1818,7 @@ serverReadReply(int port, char_u **str)
 {
     NSString *reply = [[MMBackend sharedInstance] waitForReplyOnPort:port];
     if (reply && str) {
-        char_u *s = (char_u*)[reply UTF8String];
-#ifdef FEAT_MBYTE
-        s = CONVERT_FROM_UTF8(s);
-#endif
-        *str = vim_strsave(s);
-#ifdef FEAT_MBYTE
-        CONVERT_FROM_UTF8_FREE(s);
-#endif
+        *str = [reply vimStringSave];
         return 0;
     }