[uim-commit] r894 - trunk/scm

[tkng at freedesktop.org]

Author: tkng
Date: 2005-06-19 10:03:44 -0700 (Sun, 19 Jun 2005)
New Revision: 894

Modified:
   trunk/scm/init.scm
Log:
* scm/init.scm:
 -(load-modules): Call load-enabled-modules even if LIBUIM_VANILLA is set
   to 1. This will fix the bug that we cannot test except 'direct' input
   method with test.sh.


Modified: trunk/scm/init.scm
===================================================================
--- trunk/scm/init.scm	2005-06-18 20:53:02 UTC (rev 893)
+++ trunk/scm/init.scm	2005-06-19 17:03:44 UTC (rev 894)
@@ -64,14 +64,15 @@
   (lambda ()
     (if (not (memq 'direct enabled-im-list))
 	(set! enabled-im-list (append enabled-im-list '(direct))))
-
+    
     (if (getenv "LIBUIM_VANILLA")
-	(set! enable-lazy-loading? #f)
-	(begin
-	  (if enable-lazy-loading?
-	      (require "lazy-load.scm"))
-	  (load-enabled-modules)))
+	(set! enable-lazy-loading? #f))
 
+    (if enable-lazy-loading?
+	(require "lazy-load.scm"))
+
+    (load-enabled-modules)
+
     ;; must be loaded at last of IMs
     (if (not (retrieve-im 'direct))
 	(require-module "direct"))))