===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/xm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- OpenXM_contrib2/asir2000/lib/xm	2002/08/04 07:16:54	1.17
+++ OpenXM_contrib2/asir2000/lib/xm	2002/08/10 11:12:32	1.18
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/lib/xm,v 1.16 2002/07/30 12:47:00 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/lib/xm,v 1.17 2002/08/04 07:16:54 takayama Exp $ 
 */
 /**  xm  **/
 Xm_noX = 0$  
@@ -54,9 +54,25 @@ Xm_noX = 0$  
          cf. var.sm1,  debugMode
 */
 Xm_use_timer_to_start_server = 1$
-
 XM_debug=1$
+Xm_debug_on_win_1=0$
 
+/* Utilities: it is also defined in names.rr */
+def ox_getenv(S) {
+  A = getenv(S);
+  if (A == 0) {
+    if (type(S) != 7) S=rtostr(S); 
+    S2 = ox_toupper(S);
+    A = getenv(S2);
+  }
+  return A;
+}
+def ox_toupper(S) {
+  R = [];  A = strtoascii(S);
+  for (I=0; I<length(A); I++) R=cons((A[I]>=97 && A[I]<=122?A[I]-32:A[I]),R);
+  return asciitostr(reverse(R));
+}
+
 /*&C-texi
 @c DO NOT EDIT THIS FILE   oxxm.texi
 */
@@ -76,7 +92,7 @@ XM_debug=1$
 */ 
 
 
-Sm1_lib = getenv("OpenXM_HOME")$
+Sm1_lib = ox_getenv("OpenXM_HOME")$
 if (Sm1_lib == 0) {
   Sm1_lib = "/usr/local/lib/sm1"$
 } else {
@@ -86,7 +102,7 @@ ToAsir_Debug = 0$
 
 def ox_help(A) {
   if (type(A) == 0) {
-    shell("ls "+getenv("OpenXM_HOME")+"/lib/asir/help/xm.help");
+    shell("ls "+ox_getenv("OpenXM_HOME")+"/lib/asir/help/xm.help");
   }else{
     help("xm.help/"+A)$
   }
@@ -201,12 +217,12 @@ def first(A) {return(A[0]);}
 
 
 def ox_grep(A) {
-  if (getenv("LANG") == "ja_JP.EUC") {
+  if (ox_getenv("LANG") == "ja_JP.EUC") {
     F = get_rootdir()+"/help-jp/";
   }else{
     F = get_rootdir()+"/help-eg/";
   }
-  Pager = getenv("PAGER");
+  Pager = ox_getenv("PAGER");
   if (Pager == 0) Pager="more";
   OF = F+"xm.help";