Author: yamakenz
Date: Sun Jul 22 05:18:49 2007
New Revision: 4775
Modified:
trunk/scm/hangul.scm
trunk/scm/init.scm
trunk/scm/uim-db.scm
Log:
* scm/init.scm
- Undefine SIOD-compatible the-environment
* scm/hangul.scm
* scm/uim-db.scm
- Replace SIOD-compatible the-environment with %%current-environment
Modified: trunk/scm/hangul.scm
==============================================================================
--- trunk/scm/hangul.scm (original)
+++ trunk/scm/hangul.scm Sun Jul 22 05:18:49 2007
@@ -40,7 +40,7 @@
(generic-commit-key? non-existent-key?)
(generic-proc-input-state-with-preedit-with-this-env
(%%enclose-another-env generic-proc-input-state-with-preedit
- (the-environment))))
+ (%%current-environment))))
(lambda (gc key state rkc) ;; "gc" stands for "generic-context"
(generic-proc-input-state-with-preedit-with-this-env gc key state rkc))))
@@ -52,7 +52,7 @@
(generic-proc-input-state-with-preedit
hangul-proc-on-mode-with-preedit)
(generic-proc-input-state-with-this-env
- (%%enclose-another-env generic-proc-input-state (the-environment))))
+ (%%enclose-another-env generic-proc-input-state
(%%current-environment))))
(lambda (gc key state) ;; "gc" stands for "generic-context"
(generic-proc-input-state-with-this-env gc key state))))
@@ -60,7 +60,7 @@
(define hangul-key-press-handler
(let* ((generic-proc-input-state hangul-proc-on-mode)
(generic-key-press-handler-with-this-env
- (%%enclose-another-env generic-key-press-handler (the-environment))))
+ (%%enclose-another-env generic-key-press-handler
(%%current-environment))))
(lambda (gc key state)
(generic-key-press-handler-with-this-env gc key state))))
Modified: trunk/scm/init.scm
==============================================================================
--- trunk/scm/init.scm (original)
+++ trunk/scm/init.scm Sun Jul 22 05:18:49 2007
@@ -37,6 +37,7 @@
(require-extension (srfi 23 34 60) (siod))
;; Disable SIOD compatibilities.
+(undefine the-environment)
(undefine bit-and)
(undefine bit-or)
(undefine bit-xor)
Modified: trunk/scm/uim-db.scm
==============================================================================
--- trunk/scm/uim-db.scm (original)
+++ trunk/scm/uim-db.scm Sun Jul 22 05:18:49 2007
@@ -208,7 +208,7 @@
(if (pair? pos)
(let ((code (car pos)))
(uim-db-insert-code! pos (list 'uim-db-break
- '(the-environment)
+ '(%%current-environment)
uim-db-next-id))
(uim-db-puts "Breakpoint "
uim-db-next-id
