Revision: 6744
Author: ek.kato
Date: Tue Sep 7 22:49:19 2010
Log: * scm/custom-rk.scm
- (custom-file-path)
- Use get-config-path instead of get-config-path!.
* scm/dynlib.scm
- (uim-dynlib-load-path)
- Ditto.
* scm/plugin.scm
- (uim-plugin-scm-load-path)
- (load-module-conf)
- (load-enabled-modules)
- Ditto.
http://code.google.com/p/uim/source/detail?r=6744
Modified:
/trunk/scm/custom-rt.scm
/trunk/scm/dynlib.scm
/trunk/scm/plugin.scm
=======================================
--- /trunk/scm/custom-rt.scm Sun Apr 4 20:35:54 2010
+++ /trunk/scm/custom-rt.scm Tue Sep 7 22:49:19 2010
@@ -63,7 +63,10 @@
(define custom-file-path
(lambda (gsym)
(let* ((group-name (symbol->string gsym))
- (path (string-append (get-config-path! #f)
+ (config-path (get-config-path #f))
+ (path (string-append (if config-path
+ config-path
+ "")
"/customs/custom-"
group-name
".scm")))
=======================================
--- /trunk/scm/dynlib.scm Tue Sep 7 07:42:18 2010
+++ /trunk/scm/dynlib.scm Tue Sep 7 22:49:19 2010
@@ -35,7 +35,7 @@
(if (setugid?)
(list (string-append (sys-pkglibdir) "/plugin"))
(let* ((ld-library-path (getenv "LD_LIBRARY_PATH"))
- (config-path (get-config-path! #f))
+ (config-path (get-config-path #f))
(user-plugin-path (if config-path
(string-append config-path "/plugin")
'())))
=======================================
--- /trunk/scm/plugin.scm Tue Sep 7 07:42:18 2010
+++ /trunk/scm/plugin.scm Tue Sep 7 22:49:19 2010
@@ -39,7 +39,7 @@
(define uim-plugin-scm-load-path
(if (setugid?)
(list (sys-pkgdatadir))
- (let ((config-path (get-config-path! #f))
+ (let ((config-path (get-config-path #f))
(scm-paths (string-split (load-path) ":")))
(filter string?
(append scm-paths
@@ -71,7 +71,7 @@
;; TODO: write test
(define load-module-conf
(lambda ()
- (let* ((config-path (get-config-path! #f))
+ (let* ((config-path (get-config-path #f))
(user-module-dir (if config-path
(string-append config-path "/plugin/")
#f))
@@ -100,7 +100,7 @@
;; TODO: write test
(define load-enabled-modules
(lambda ()
- (let* ((config-path (get-config-path! #f))
+ (let* ((config-path (get-config-path #f))
(user-module-dir (if config-path
(string-append config-path "/plugin/")
#f))
