Author: ek.kato
Date: Tue Jan 20 18:33:38 2009
New Revision: 5765
Modified:
branches/1.5/scm/im-custom.scm
branches/1.5/scm/im.scm
Log:
* Port r5764 from trunk.
Modified: branches/1.5/scm/im-custom.scm
==============================================================================
--- branches/1.5/scm/im-custom.scm (original)
+++ branches/1.5/scm/im-custom.scm Tue Jan 20 18:33:38 2009
@@ -278,7 +278,7 @@
(N_ "Input method switching")
(N_ "long description will be here."))
-(define-custom 'enable-im-switch #f
+(define-custom 'enable-im-switch? #f
'(global im-switching)
'(boolean)
(N_ "Enable IM switching by hotkey")
@@ -297,15 +297,15 @@
(N_ "long description will be here."))
;; activity dependency
-(custom-add-hook 'switch-im-key?
+(custom-add-hook 'switch-im-key
'custom-activity-hooks
(lambda ()
- enable-im-switch))
+ enable-im-switch?))
(custom-add-hook 'switch-im-skip-direct-im?
'custom-activity-hooks
(lambda ()
- enable-im-switch))
+ enable-im-switch?))
;; im-toggle
(define-custom-group 'im-toggle
Modified: branches/1.5/scm/im.scm
==============================================================================
--- branches/1.5/scm/im.scm (original)
+++ branches/1.5/scm/im.scm Tue Jan 20 18:33:38 2009
@@ -38,7 +38,6 @@
(require "load-action.scm")
;; config
-(define enable-im-switch #f)
(define default-im-name #f)
;; preedit attributes: should be moved to another file
@@ -454,7 +453,7 @@
((and enable-im-toggle?
(toggle-im-key? key state))
(toggle-im uc c))
- ((and enable-im-switch
+ ((and enable-im-switch?
(switch-im-key? key state))
(switch-im uc (im-name im)))
((modifier-key? key state)
