[uim-commit] r590 - trunk/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-02-06 23:34:31 -0800 (Sun, 06 Feb 2005)
New Revision: 590

Modified:
   trunk/scm/custom.scm
Log:
* scm/custom.scm
  - (custom-choice-label, custom-choice-desc):
    * Fix Siod-dependent invalid predicate. assq does not return ()
      but #f. Don't use null? to test #f
    * Return val-sym instead of empty string


Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm	2005-02-07 06:10:43 UTC (rev 589)
+++ trunk/scm/custom.scm	2005-02-07 07:34:31 UTC (rev 590)
@@ -350,17 +350,17 @@
   (lambda (custom-sym val-sym)
     (let* ((sym-rec-alist (custom-type-attrs custom-sym))
 	   (srec (assq val-sym sym-rec-alist)))
-      (if (null? srec)
-	  ""
-	  (custom-choice-rec-label srec)))))
+      (if srec
+	  (custom-choice-rec-label srec)
+	  (symbol->string val-sym)))))
 
 (define custom-choice-desc
   (lambda (custom-sym val-sym)
     (let* ((sym-rec-alist (custom-type-attrs custom-sym))
 	   (srec (assq val-sym sym-rec-alist)))
-      (if (null? srec)
-	  "" 
-	  (custom-choice-rec-desc srec)))))
+      (if srec
+	  (custom-choice-rec-desc srec)
+	  (symbol->string val-sym)))))
 
 (define custom-choice-range-reflect-olist-val
   (lambda (dst-sym src-sym indication-alist)