[uim-commit] r315 - trunk/scm

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-17 19:34:20 -0800 (Mon, 17 Jan 2005)
New Revision: 315

Modified:
   trunk/scm/custom-rt.scm
Log:
* scm/custom-rt.scm
  - (require-custom): Accept defined-order groups instead of
    reversed-order one. This change has been fixed broken per-user
    config loading on custom.scm. Thanks Etsushi Kato for reporting.
  - (custom-list-primary-groups): Return as defined order


Modified: trunk/scm/custom-rt.scm
===================================================================
--- trunk/scm/custom-rt.scm	2005-01-18 02:18:54 UTC (rev 314)
+++ trunk/scm/custom-rt.scm	2005-01-18 03:34:20 UTC (rev 315)
@@ -70,9 +70,7 @@
 	  (set! custom-required-custom-files
 		(cons filename custom-required-custom-files)))
       (let* ((post-groups (custom-list-primary-groups))
-	     (nr-new-groups (- (length post-groups)
-			       (length pre-groups)))
-	     (new-groups (list-head post-groups nr-new-groups)))
+	     (new-groups (list-tail post-groups (length pre-groups))))
 	(if (not (getenv "LIBUIM_VANILLA"))
 	    (for-each custom-load-group-conf
 		      (reverse new-groups)))))))
@@ -96,7 +94,7 @@
 ;; lightweight implementation
 (define custom-list-primary-groups
   (lambda ()
-    custom-rt-primary-groups))
+    (reverse custom-rt-primary-groups)))
 
 ;; lightweight implementation
 (define custom-add-hook