Author: ek.kato
Date: Mon Oct 15 21:57:33 2007
New Revision: 5028
Modified:
trunk/scm/prime-custom.scm
trunk/scm/prime.scm
Log:
* scm/prime-custom.scm
- Add a hook for prime-custom-app-mode-vi?
* scm/prime.scm
- (prime-configure-app-mode-vi) : New.
- (prime-release-key-handler) : Don't call
prime-update-key-release in prime-mode-application.
Modified: trunk/scm/prime-custom.scm
==============================================================================
--- trunk/scm/prime-custom.scm (original)
+++ trunk/scm/prime-custom.scm Mon Oct 15 21:57:33 2007
@@ -155,6 +155,11 @@
(N_ "Enable vi-cooperative mode")
(N_ "long description will be here."))
+(custom-add-hook 'prime-custom-app-mode-vi?
+ 'custom-set-hooks
+ (lambda ()
+ (prime-configure-app-mode-vi)))
+
(define-custom 'prime-pseudo-mode-cursor? #f
'(prime-advanced special-op)
'(boolean)
Modified: trunk/scm/prime.scm
==============================================================================
--- trunk/scm/prime.scm (original)
+++ trunk/scm/prime.scm Mon Oct 15 21:57:33 2007
@@ -61,16 +61,20 @@
(define prime-app-mode-end-stroke-list #f)
;;;; If you're a Vi user, modify the lines below.
-(if prime-custom-app-mode-vi?
- (begin
- ;; For Vi users
- (define-key prime-app-mode-start-key? prime-escape-key?)
- (set! prime-app-mode-end-stroke-list
- '("i" "I" "a" "A" "o" "O" "C" "s" "S" ("c" . ("l" "w" "e" "c"
"G")))))
- (begin
- ;; Default
- (define-key prime-app-mode-start-key? #f)
- (set! prime-app-mode-end-stroke-list #f)))
+(define prime-configure-app-mode-vi
+ (lambda ()
+ (if prime-custom-app-mode-vi?
+ (begin
+ ;; For Vi users
+ (define-key prime-app-mode-start-key? prime-escape-key?)
+ (set! prime-app-mode-end-stroke-list
+ '("i" "I" "a" "A" "o" "O" "C" "s" "S" ("c" . ("l" "w" "e" "c"
"G")))))
+ (begin
+ ;; Default
+ (define-key prime-app-mode-start-key? #f)
+ (set! prime-app-mode-end-stroke-list #f)))))
+
+(prime-configure-app-mode-vi)
(define prime-cand-select-key?
(lambda (key key-state)
@@ -2075,8 +2079,8 @@
(lambda (context key key-state)
;(print "prime-release-key-handler")
(if (or (ichar-control? key)
- (= (prime-context-mode context)
- prime-mode-latin))
+ (= (prime-context-mode context) prime-mode-latin)
+ (= (prime-context-mode context) prime-mode-application))
(im-commit-raw context)
;; else
;; FIXME: update candidate words.
