[uim-commit] r1228 - in branches/r5rs: . scm uim

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-18 13:20:20 -0700 (Thu, 18 Aug 2005)
New Revision: 1228

Modified:
   branches/r5rs/Makefile.am
   branches/r5rs/scm/custom.scm
   branches/r5rs/uim/uim-util.c
Log:
* fixed trivial mistakes.
  Now, (car '()) is an error, so many functions are not working...

* scm/custom.scm
  - (custom-broadcast-custom): fixed wrong lambda syntax
* uim/uim-util.c
  - (iterate_lists): use uim_scm_c_int to the result of uim_scm_length
* Makefile.am
  - change build order
  


Modified: branches/r5rs/Makefile.am
===================================================================
--- branches/r5rs/Makefile.am	2005-08-18 18:35:02 UTC (rev 1227)
+++ branches/r5rs/Makefile.am	2005-08-18 20:20:20 UTC (rev 1228)
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = m4 doc uim scm gtk qt xim helper po tables test fep examples pixmaps sigscheme
+SUBDIRS = m4 doc sigscheme uim scm gtk qt xim helper po tables test fep examples pixmaps
 EXTRA_DIST = README.ja INSTALL.ja test.sh.in uim.spec.in \
 	intltool-extract.in intltool-merge.in intltool-update.in \
 	uim.pc.in ChangeLog.old uim.desktop autogen.sh RELEASING

Modified: branches/r5rs/scm/custom.scm
===================================================================
--- branches/r5rs/scm/custom.scm	2005-08-18 18:35:02 UTC (rev 1227)
+++ branches/r5rs/scm/custom.scm	2005-08-18 20:20:20 UTC (rev 1228)
@@ -717,7 +717,7 @@
 ;; TODO: implement after uim 0.4.6 depending on scm-nested-eval
 (define custom-broadcast-custom
   (lambda (sym)
-    ))
+  #f))
 
 ;; API
 ;; #f means 'any group'

Modified: branches/r5rs/uim/uim-util.c
===================================================================
--- branches/r5rs/uim/uim-util.c	2005-08-18 18:35:02 UTC (rev 1227)
+++ branches/r5rs/uim/uim-util.c	2005-08-18 20:20:20 UTC (rev 1228)
@@ -508,7 +508,7 @@
   uim_lisp elms, rest, rests, mapped, res, termp, pair, form;
   uim_bool single_listp;
 
-  single_listp = (uim_scm_length(lists) == 1) ? UIM_TRUE : UIM_FALSE;
+  single_listp = (uim_scm_c_int(uim_scm_length(lists)) == 1) ? UIM_TRUE : UIM_FALSE;
   res = seed;
   if (single_listp) {
     rest = uim_scm_car(lists);