Remove FILTER-MAP from smtp.scm and use the FILTER-MAP from SRFI 1

instead.

scheme/lib/smtp.scm

@@ -76,16 +76,6 @@
 		     (values code text)
 		     (values 700 losers))))))))))
 
-;;; Trivial utility -- like map, but filter out #f's.
-
-(define (filter-map f lis)
-  (let lp ((ans '()) (lis lis))
-    (if (pair? lis)
-	(lp (cond ((f (car lis)) => (lambda (val) (cons val ans)))
-		  (else ans))
-	    (cdr lis))
-	(reverse ans))))
-
 ;;; EXPN, VRFY, MAIL-HELP
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; These three are simple queries of the server.

scheme/packages.scm

@@ -438,6 +438,7 @@
 				
   (open scsh			; write-string read-string/partial force-output
 				;   system-name user-login-name and sockets
+	(subset srfi-1 (filter-map))
 	crlf-io			; read-crlf-line write-crlf
 	receiving		; values receive
 	let-opt			; let-optionals