diff src/defaults.cc @ 5451:ed08548b9054

[project @ 2005-09-15 19:52:50 by jwe]
author jwe
date Thu, 15 Sep 2005 19:52:50 +0000
parents b12c0f920da0
children 26beffa9f66f
line wrap: on
line diff
--- a/src/defaults.cc	Thu Sep 15 15:36:26 2005 +0000
+++ b/src/defaults.cc	Thu Sep 15 19:52:50 2005 +0000
@@ -281,7 +281,7 @@
 
       if (! shell_path.empty ())
 	{
-	  Vexec_path = std::string (":");
+	  Vexec_path = std::string (SEPCHAR_STR);
 	  Vexec_path.append (shell_path);
 	}
     }
@@ -296,7 +296,7 @@
 
   std::string oct_path = octave_env::getenv ("OCTAVE_PATH");
 
-  Vload_path = oct_path.empty () ? std::string (":") : oct_path;
+  Vload_path = oct_path.empty () ? std::string (SEPCHAR_STR) : oct_path;
 
   update_load_path_dir_path ();
 }
@@ -379,7 +379,8 @@
       size_t pos = 0;
       do
 	{
-	  pos = retval.find ("::");
+	  pos = retval.find (std::string (SEPCHAR_STR) + 
+			     std::string (SEPCHAR_STR));
 
 	  if (pos != NPOS)
 	    retval.insert (pos+1, Vdefault_load_path);
@@ -587,7 +588,8 @@
       // I'm not sure whether this causes more problems that it
       // solves...
       //      if (! (s[0] == ':' || s[s.length () - 1] == ':'
-      //	     || s.find ("::") != NPOS))
+      //	     || s.find (std::string (SEPCHAR_STR) + 
+      //                        std::string (SEPCHAR_STR)) != NPOS))
       //	warning ("LOADPATH will ignore default load path");
 
       Vload_path = s;
@@ -697,8 +699,10 @@
 @code{LOADPATH} is now handled in the same way as @TeX{} handles\n\
 @code{TEXINPUTS}.  Leading, trailing, or doubled colons that appear in\n\
 @code{LOADPATH} are replaced by the value of @code{DEFAULT_LOADPATH}.\n\
-The default value of @code{LOADPATH} is @code{\":\"}, which tells Octave\n\
-to search in the directories specified by @code{DEFAULT_LOADPATH}.\n\
+The default value of @code{LOADPATH} is @code{\"\n"
+SEPCHAR_STR
+"\"}, which tells Octave to search in the directories specified by\n\
+@code{DEFAULT_LOADPATH}.\n\
 \n\
 In addition, if any path element ends in @samp{//}, that directory and\n\
 all subdirectories it contains are searched recursively for function\n\