@@ -256,11 +256,11 @@
 	(if split
 	    tlist
 	    target)
 	(if target
 	    (begin
-	      (debug:print 0 "ERROR: Invalid target, spaces or blanks not allowed")
+	      (debug:print 0 "ERROR: Invalid target, spaces or blanks not allowed \"" target "\"")
 	      #f)
 	    #f))))
 
 ;;======================================================================
 ;; M I S C   L I S T S
@@ -387,30 +387,36 @@
 	"unknown"
 	(caar uname-res))))
 	      
 (define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR")))
   (let ((envvars (get-environment-variables))
-        (whitesp (regexp "[^a-zA-Z0-9_\\-:;,.\\/%$]")))
+        (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
-          (for-each (lambda (key)
-		      (let* ((val (cdr key))
-			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
+          (for-each (lambda (keyval)
+		      (let* ((key   (car keyval))
+			     (val   (cdr keyval))
+			     (delim (if (string-search whitesp val) 
+					"\""
+					"")))
 			(print (if (member key ignorevars)
 				   "# setenv "
 				   "setenv ")
-			       (car key) " " sval)))
-		      envvars)))
+			       key " " delim val delim)))
+		    envvars)))
      (with-output-to-file (conc fname ".sh")
        (lambda ()
-          (for-each (lambda (key)
-		      (let* ((val (cdr key))
-			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
+          (for-each (lambda (keyval)
+		      (let* ((key (car keyval))
+			     (val (cdr keyval))
+			     (delim (if (string-search whitesp val) 
+					"\""
+					"")))
 			(print (if (member key ignorevars)
 				   "# export "
 				   "export ")
-			       (car key) "=" sval)))
+			       key "=" delim val delim)))
                     envvars)))))
 
 ;; set some env vars from an alist, return an alist with original values
 ;; (("VAR" "value") ...)
 (define (alist->env-vars lst)