emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r109385: * src/nsterm.m (ns_exec_path


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r109385: * src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR
Date: Wed, 01 Aug 2012 21:06:38 -0700
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 109385
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-01 21:06:38 -0700
message:
  * src/nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR
  (rather than hard-coding the path separator).
modified:
  src/ChangeLog
  src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-01 20:51:44 +0000
+++ b/src/ChangeLog     2012-08-02 04:06:38 +0000
@@ -1,3 +1,8 @@
+2012-08-02  Glenn Morris  <address@hidden>
+
+       * nsterm.m (ns_exec_path, ns_load_path): Use SEPCHAR rather than
+       hard-coding the path separator.
+
 2012-08-01  Paul Eggert  <address@hidden>
 
        Use "ASET (a, i, v)" rather than "AREF (a, i) = v".

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-08-01 20:15:30 +0000
+++ b/src/nsterm.m      2012-08-02 04:06:38 +0000
@@ -329,8 +329,7 @@
   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 @@
   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:


reply via email to

[Prev in Thread] Current Thread [Next in Thread]