[uim-commit] r866 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-06-05 08:58:53 -0700 (Sun, 05 Jun 2005)
New Revision: 866

Modified:
   trunk/scm/skk-custom.scm
   trunk/scm/skk.scm
Log:
* scm/skk.scm : Revert the changes in r863.
* scm/skk-custom.scm : Ditto.


Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm	2005-06-05 14:54:37 UTC (rev 865)
+++ trunk/scm/skk-custom.scm	2005-06-05 15:58:53 UTC (rev 866)
@@ -87,20 +87,21 @@
   (_ "Candidate selection style")
   (_ "long description will be here."))
 
-(custom-add-hook 'skk-candidate-selection-style
-		 'custom-set-hooks
-		 (lambda ()
-		   (if (= skk-candidate-selection-style 'ddskk-like)
-		       (begin
-			 (custom-set-value! 'skk-candidate-op-count 4)
-			 (custom-set-value!
-			  'skk-nr-candidate-max
-			  (length skk-ddskk-like-heading-label-char-list)))
-		       (begin	
-			 (custom-set-value! 'skk-candidate-op-count 2)
-			 (custom-set-value!
-			  'skk-nr-candidate-max
-			  (length skk-uim-heading-label-char-list))))))
+; disabled since it has a side effect --ekato
+;(custom-add-hook 'skk-candidate-selection-style
+;		 'custom-set-hooks
+;		 (lambda ()
+;		   (if (= skk-candidate-selection-style 'ddskk-like)
+;		       (begin
+;			 (custom-set-value! 'skk-candidate-op-count 4)
+;			 (custom-set-value!
+;			  'skk-nr-candidate-max
+;			  (length skk-ddskk-like-heading-label-char-list)))
+;		       (begin	
+;			 (custom-set-value! 'skk-candidate-op-count 2)
+;			 (custom-set-value!
+;			  'skk-nr-candidate-max
+;			  (length skk-uim-heading-label-char-list))))))
 
 ;; activity dependency
 (custom-add-hook 'skk-candidate-op-count

Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-06-05 14:54:37 UTC (rev 865)
+++ trunk/scm/skk.scm	2005-06-05 15:58:53 UTC (rev 866)
@@ -55,6 +55,9 @@
 ;; encoding conversion problem.  -- YamaKen 2005-02-02
 (define skk-auto-start-henkan-keyword-list '("¤ò" "¡¢" "¡£" "¡¥" "¡¤" "¡©" "¡×" "¡ª" "¡¨" "¡§" ")" ";" ":" "¡Ë" "¡É" "¡Û" "¡Ù" "¡Õ" "¡Ó" "¡Ñ" "¡Ï" "¡Í" "}" "]" "?" "." "," "!"))
 
+(define skk-ddskk-like-heading-label-char-list '("a" "s" "d" "f" "j" "k" "l"))
+(define skk-uim-heading-label-char-list '("1" "2" "3" "4" "5" "6" "7" "8" "9" "0"))
+
 ;; style specification
 (define skk-style-spec
   '(;; (style-element-name . validator)