[uim-commit] r2605 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-15 23:33:19 -0800 (Thu, 15 Dec 2005)
New Revision: 2605

Modified:
   trunk/scm/canna-custom.scm
   trunk/scm/canna.scm
Log:
* scm/canna.scn (canna-proc-compose-state) : Fix behavior with
  canna-backspace-key?.
* scm/canna-custom.scm (custom-activate-canna-server-name?) : Fix
  short description.


Modified: trunk/scm/canna-custom.scm
===================================================================
--- trunk/scm/canna-custom.scm	2005-12-16 05:56:43 UTC (rev 2604)
+++ trunk/scm/canna-custom.scm	2005-12-16 07:33:19 UTC (rev 2605)
@@ -301,7 +301,7 @@
 (define-custom 'custom-activate-canna-server-name? #f
   '(cannaserver)
   '(boolean)
-  (_ "Use Canna server")
+  (_ "Specify Canna server")
   (_ "long description will be here."))
 
 (define-custom 'custom-preserved-canna-server-name ""

Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm	2005-12-16 05:56:43 UTC (rev 2604)
+++ trunk/scm/canna.scm	2005-12-16 07:33:19 UTC (rev 2605)
@@ -819,7 +819,8 @@
      ((canna-backspace-key? key key-state)
       (begin
 	(canna-context-set-state! cc #f)
-	(canna-reset-candidate-window cc)))
+	(canna-reset-candidate-window cc)
+	(canna-lib-reset-conversion cc-id)))
 
      ((canna-next-candidate-key? key key-state)
       (canna-move-candidate cc 1))