Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -351,27 +351,29 @@
 (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_\\-:;,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
-          (for-each (lambda (key)
-		      (let* ((val (cdr key))
+          (for-each (lambda (keyval)
+		      (let* ((key (car keyval))
+			     (val (cdr keyval))
 			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
 			(print (if (member key ignorevars)
 				   "# setenv "
 				   "setenv ")
-			       (car key) " " sval)))
+			       key " " sval)))
 		      envvars)))
      (with-output-to-file (conc fname ".sh")
        (lambda ()
-          (for-each (lambda (key)
-		      (let* ((val (cdr key))
+          (for-each (lambda (keyval)
+		      (let* ((key (car keyval))
+			     (val (cdr keyval))
 			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
 			(print (if (member key ignorevars)
 				   "# export "
 				   "export ")
-			       (car key) "=" sval)))
+			       key "=" sval)))
                     envvars)))))
 
 ;; set some env vars from an alist, return an alist with original values
 ;; (("VAR" "value") ...)
 (define (alist->env-vars lst)