* src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR

(rather than hard-coding the path separator).

diff --git a/src/ChangeLog b/src/ChangeLog
index 3954d4892517f8ecf0980d111a8f7dd71199dec4..e10550957c8db2a12f042c84c2048949fd715a5e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+       * nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR rather than
+       hard-coding the path separator.
+
 2012-08-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use "ASET (a, i, v)" rather than "AREF (a, i) = v".

diff --git a/src/nsterm.m b/src/nsterm.m
index 48a3b7543a86441292e71a20c76df57bf41285f9..4c0e0e579268cbe16b727a5cf67492b10e40800a 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -329,8 +329,7 @@ ns_exec_path (void)
   NSString *binDir = [bundle bundlePath];
   NSString *resourcePath, *resourcePaths;
   NSRange range;
-  BOOL onWindows = NO;       /* FIXME determine this somehow  */
-  NSString *pathSeparator = onWindows ? @";" : @":";
+  NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR];
   NSFileManager *fileManager = [NSFileManager defaultManager];
   NSArray *paths;
   NSEnumerator *pathEnum;
@@ -377,8 +376,7 @@ ns_load_path (void)
   NSBundle *bundle = [NSBundle mainBundle];
   NSString *resourceDir = [bundle resourcePath];
   NSString *resourcePath, *resourcePaths;
-  BOOL onWindows = NO;          /* FIXME determine this somehow */
-  NSString *pathSeparator = onWindows ? @";" : @":";
+  NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR];
   NSFileManager *fileManager = [NSFileManager defaultManager];
   BOOL isDir;
   NSArray *paths = [resourceDir stringsByAppendingPaths: