diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-08-01 21:06:38 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-08-01 21:06:38 -0700 |
| commit | 90df0db330dc6d168bf8cdb950a066a2916857ad (patch) | |
| tree | 66559d3760b877d67738b6dae44afcad62d9a153 | |
| parent | 3f750e43e882ebff19fba2d243873dcdedce1dda (diff) | |
| download | emacs-90df0db330dc6d168bf8cdb950a066a2916857ad.tar.gz | |
* src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR
(rather than hard-coding the path separator).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3954d489251..e10550957c8 100644 --- 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 48a3b7543a8..4c0e0e57926 100644 --- 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: |