[uim-commit] r947 - trunk/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-07-06 23:28:07 -0700 (Wed, 06 Jul 2005)
New Revision: 947

Modified:
   trunk/scm/im-custom.scm
Log:
* scm/im-custom.scm
  - (custom-im-list-as-choice-rec): Simplify. Validated with test-im.scm


Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm	2005-07-07 05:01:02 UTC (rev 946)
+++ trunk/scm/im-custom.scm	2005-07-07 06:28:07 UTC (rev 947)
@@ -34,15 +34,13 @@
 ;; ugettext should be performed higher layer
 (define custom-im-list-as-choice-rec
   (lambda (lst)
-    (filter list?
-     (map (lambda (im)
-	    (if im
-		(let ((sym (im-name im))
-		      (name-label (ugettext (im-name-label im)))
-		      (desc (ugettext (im-short-desc im))))
-		  (custom-choice-rec-new sym name-label desc))
-		#f))
-	  lst))))
+     (filter-map (lambda (im)
+		   (and im
+			(let ((sym (im-name im))
+			      (name-label (ugettext (im-name-label im)))
+			      (desc (ugettext (im-short-desc im))))
+			  (custom-choice-rec-new sym name-label desc))))
+		 lst)))
   
 (define-custom-group 'global
 		     (_ "Global settings")