aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-08-01 21:06:38 -0700
committerGlenn Morris2012-08-01 21:06:38 -0700
commit90df0db330dc6d168bf8cdb950a066a2916857ad (patch)
tree66559d3760b877d67738b6dae44afcad62d9a153 /src
parent3f750e43e882ebff19fba2d243873dcdedce1dda (diff)
downloademacs-90df0db330dc6d168bf8cdb950a066a2916857ad.tar.gz
emacs-90df0db330dc6d168bf8cdb950a066a2916857ad.zip
* src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR
(rather than hard-coding the path separator).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m6
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 @@
12012-08-02 Glenn Morris <rgm@gnu.org>
2
3 * nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR rather than
4 hard-coding the path separator.
5
12012-08-01 Paul Eggert <eggert@cs.ucla.edu> 62012-08-01 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Use "ASET (a, i, v)" rather than "AREF (a, i) = v". 8 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)
329 NSString *binDir = [bundle bundlePath]; 329 NSString *binDir = [bundle bundlePath];
330 NSString *resourcePath, *resourcePaths; 330 NSString *resourcePath, *resourcePaths;
331 NSRange range; 331 NSRange range;
332 BOOL onWindows = NO; /* FIXME determine this somehow */ 332 NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR];
333 NSString *pathSeparator = onWindows ? @";" : @":";
334 NSFileManager *fileManager = [NSFileManager defaultManager]; 333 NSFileManager *fileManager = [NSFileManager defaultManager];
335 NSArray *paths; 334 NSArray *paths;
336 NSEnumerator *pathEnum; 335 NSEnumerator *pathEnum;
@@ -377,8 +376,7 @@ ns_load_path (void)
377 NSBundle *bundle = [NSBundle mainBundle]; 376 NSBundle *bundle = [NSBundle mainBundle];
378 NSString *resourceDir = [bundle resourcePath]; 377 NSString *resourceDir = [bundle resourcePath];
379 NSString *resourcePath, *resourcePaths; 378 NSString *resourcePath, *resourcePaths;
380 BOOL onWindows = NO; /* FIXME determine this somehow */ 379 NSString *pathSeparator = [NSString stringWithFormat: @"%c", SEPCHAR];
381 NSString *pathSeparator = onWindows ? @";" : @":";
382 NSFileManager *fileManager = [NSFileManager defaultManager]; 380 NSFileManager *fileManager = [NSFileManager defaultManager];
383 BOOL isDir; 381 BOOL isDir;
384 NSArray *paths = [resourceDir stringsByAppendingPaths: 382 NSArray *paths = [resourceDir stringsByAppendingPaths: