[uim-commit] r262 - in trunk: po scm uim

yamaken@freedesktop.org yamaken@freedesktop.org
Tue Jan 11 14:55:08 PST 2005 

Author: yamaken
Date: 2005-01-11 14:55:05 -0800 (Tue, 11 Jan 2005)
New Revision: 262

Modified:
   trunk/po/ja.po
   trunk/po/uim.pot
   trunk/scm/custom-vars.scm
   trunk/uim/uim-compat-scm.c
   trunk/uim/uim-custom.c
Log:
* uim/uim-custom.c
  - (uim_custom_key_get): Fix broken Scheme interfaces
  - (uim_custom_cb_remove): Fix wrong variable name
* uim/uim-compat-scm.c
  - (uim_scm_c_str_failsafe): Add check for #f

* scm/custom-vars.scm
  - (custom switch-im-key): Uncomment
  - (custom generic-on-key, custom generic-off-key, custom
    generic-begin-conv-key, custom generic-commit-key, custom
    generic-cancel-key, custom generic-next-candidate-key, custom
    generic-prev-candidate-key, custom generic-next-page-key, custom
    generic-prev-page-key, custom generic-beginning-of-preedit-key,
    custom generic-end-of-preedit-key, custom generic-kill-key, custom
    generic-kill-backward-key, custom generic-backspace-key, custom
    generic-delete-key, custom generic-go-left-key, custom
    generic-go-right-key, custom generic-return-key): Gettextize
  - (custom skk-dic-file-name, custom skk-personal-dic-filename,
    custom skk-uim-personal-dic-filename): Move to bottom of the group
* po/uim.pot
* po/ja.po
  - Update


Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2005-01-11 20:47:12 UTC (rev 261)
+++ trunk/po/ja.po	2005-01-11 22:55:05 UTC (rev 262)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: uim 2010\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-12 05:32+0900\n"
-"PO-Revision-Date: 2005-01-12 05:37+0900\n"
+"POT-Creation-Date: 2005-01-12 06:34+0900\n"
+"PO-Revision-Date: 2005-01-2 07:49+0900\n"
 "Last-Translator: YamaKen <yamaken@bp.iij4u.or.jp>\n"
 "Language-Team: Japanese <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -353,7 +353,7 @@
 
 #: helper/pref-gtk.c:470
 msgid "File"
-msgstr "¥Õ¥¡¥¤¥ë"
+msgstr "»²¾È"
 
 #: helper/toolbar-common-gtk.c:480
 msgid "sw"
@@ -498,22 +498,22 @@
 
 #: scm/custom-vars.lisp:59 scm/custom-vars.lisp:63 scm/custom-vars.lisp:70
 #: scm/custom-vars.lisp:76 scm/custom-vars.lisp:94 scm/custom-vars.lisp:172
-#: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:205
-#: scm/custom-vars.lisp:214 scm/custom-vars.lisp:218 scm/custom-vars.lisp:340
-#: scm/custom-vars.lisp:346 scm/custom-vars.lisp:352 scm/custom-vars.lisp:358
-#: scm/custom-vars.lisp:364 scm/custom-vars.lisp:370 scm/custom-vars.lisp:384
-#: scm/custom-vars.lisp:390 scm/custom-vars.lisp:396 scm/custom-vars.lisp:402
-#: scm/custom-vars.lisp:408 scm/custom-vars.lisp:415 scm/custom-vars.lisp:421
-#: scm/custom-vars.lisp:427 scm/custom-vars.lisp:493 scm/custom-vars.lisp:500
-#: scm/custom-vars.lisp:507 scm/custom-vars.lisp:513 scm/custom-vars.lisp:519
-#: scm/custom-vars.lisp:525 scm/custom-vars.lisp:533 scm/custom-vars.lisp:539
-#: scm/custom-vars.lisp:545 scm/custom-vars.lisp:551 scm/custom-vars.lisp:557
-#: scm/custom-vars.lisp:563 scm/custom-vars.lisp:589 scm/custom-vars.lisp:595
-#: scm/custom-vars.lisp:601 scm/custom-vars.lisp:607 scm/custom-vars.lisp:613
-#: scm/custom-vars.lisp:620 scm/custom-vars.lisp:634 scm/custom-vars.lisp:640
-#: scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
+#: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:191
+#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:214 scm/custom-vars.lisp:218
+#: scm/custom-vars.lisp:340 scm/custom-vars.lisp:346 scm/custom-vars.lisp:352
+#: scm/custom-vars.lisp:358 scm/custom-vars.lisp:364 scm/custom-vars.lisp:370
+#: scm/custom-vars.lisp:384 scm/custom-vars.lisp:390 scm/custom-vars.lisp:396
+#: scm/custom-vars.lisp:402 scm/custom-vars.lisp:408 scm/custom-vars.lisp:415
+#: scm/custom-vars.lisp:421 scm/custom-vars.lisp:427 scm/custom-vars.lisp:493
+#: scm/custom-vars.lisp:500 scm/custom-vars.lisp:507 scm/custom-vars.lisp:513
+#: scm/custom-vars.lisp:519 scm/custom-vars.lisp:525 scm/custom-vars.lisp:533
+#: scm/custom-vars.lisp:539 scm/custom-vars.lisp:545 scm/custom-vars.lisp:551
+#: scm/custom-vars.lisp:557 scm/custom-vars.lisp:563 scm/custom-vars.lisp:589
+#: scm/custom-vars.lisp:595 scm/custom-vars.lisp:601 scm/custom-vars.lisp:607
+#: scm/custom-vars.lisp:613 scm/custom-vars.lisp:620 scm/custom-vars.lisp:634
+#: scm/custom-vars.lisp:640 scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
 msgid "long description will be here."
-msgstr ""
+msgstr "¾ÜºÙµ­½ÒͽÄê"
 
 #: scm/custom-vars.lisp:62
 msgid "Advanced settings"
@@ -539,6 +539,10 @@
 msgid "Enable IM switching by hotkey"
 msgstr "¥Û¥Ã¥È¥­¡¼¤Ç¤ÎIMÀÚÂؤ¨¤òÍ­¸ú¤Ë¤¹¤ë"
 
+#: scm/custom-vars.lisp:190
+msgid "IM switching key"
+msgstr "IMÀÚÂؤ¨¥­¡¼"
+
 #: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
 msgid "uim"
 msgstr ""
@@ -567,6 +571,87 @@
 msgid "Global key bindings"
 msgstr "Á´ÂÎ¥­¡¼ÀßÄê"
 
+#: scm/custom-vars.lisp:223
+msgid "[Global] on"
+msgstr "[Á´ÂÎ] ¥ª¥ó"
+
+#: scm/custom-vars.lisp:224 scm/custom-vars.lisp:230 scm/custom-vars.lisp:236
+#: scm/custom-vars.lisp:242 scm/custom-vars.lisp:248 scm/custom-vars.lisp:254
+#: scm/custom-vars.lisp:260 scm/custom-vars.lisp:266 scm/custom-vars.lisp:272
+#: scm/custom-vars.lisp:278 scm/custom-vars.lisp:284 scm/custom-vars.lisp:290
+#: scm/custom-vars.lisp:296 scm/custom-vars.lisp:302 scm/custom-vars.lisp:308
+#: scm/custom-vars.lisp:314 scm/custom-vars.lisp:320 scm/custom-vars.lisp:326
+msgid "long description will be here"
+msgstr "¾ÜºÙµ­½ÒͽÄê"
+
+#: scm/custom-vars.lisp:229
+msgid "[Global] off"
+msgstr "[Á´ÂÎ] ¥ª¥Õ"
+
+#: scm/custom-vars.lisp:235
+msgid "[Global] begin conversion"
+msgstr "[Á´ÂÎ] ÊÑ´¹³«»Ï"
+
+#: scm/custom-vars.lisp:241
+msgid "[Global] commit"
+msgstr "[Á´ÂÎ] ³ÎÄê"
+
+#: scm/custom-vars.lisp:247
+msgid "[Global] cancel"
+msgstr "[Á´ÂÎ] ¥­¥ã¥ó¥»¥ë"
+
+#: scm/custom-vars.lisp:253
+msgid "[Global] next candidate"
+msgstr "[Á´ÂÎ] ¼¡¸õÊä"
+
+#: scm/custom-vars.lisp:259
+msgid "[Global] previous candidate"
+msgstr "[Á´ÂÎ] Á°¸õÊä"
+
+#: scm/custom-vars.lisp:265
+msgid "[Global] next page of candidate window"
+msgstr "[Á´ÂÎ] ¸õÊ䥦¥£¥ó¥É¥¦¤Î¼¡¥Ú¡¼¥¸"
+
+#: scm/custom-vars.lisp:271
+msgid "[Global] previous page of candidate window"
+msgstr "[Á´ÂÎ] ¸õÊ䥦¥£¥ó¥É¥¦¤ÎÁ°¥Ú¡¼¥¸"
+
+#: scm/custom-vars.lisp:277
+msgid "[Global] beginning of preedit"
+msgstr "[Á´ÂÎ] ÊÔ½¸Îΰè¤ÎÀèƬ"
+
+#: scm/custom-vars.lisp:283
+msgid "[Global] end of preedit"
+msgstr "[Á´ÂÎ] ÊÔ½¸Îΰè¤ÎËöÈø"
+
+#: scm/custom-vars.lisp:289
+msgid "[Global] erase after cursor"
+msgstr "[Á´ÂÎ] ¥«¡¼¥½¥ë°Ê¹ß¤ò¾Ãµî"
+
+#: scm/custom-vars.lisp:295
+msgid "[Global] erase before cursor"
+msgstr "[Á´ÂÎ] ¥«¡¼¥½¥ë°ÊÁ°¤ò¾Ãµî"
+
+#: scm/custom-vars.lisp:301
+msgid "[Global] backspace"
+msgstr "[Á´ÂÎ] ¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹"
+
+#: scm/custom-vars.lisp:307
+msgid "[Global] delete"
+msgstr "[Á´ÂÎ] ¥Ç¥ê¡¼¥È"
+
+#: scm/custom-vars.lisp:313
+msgid "[Global] left"
+msgstr "[Á´ÂÎ] º¸"
+
+#: scm/custom-vars.lisp:319
+msgid "[Global] right"
+msgstr "[Á´ÂÎ] ±¦"
+
+#: scm/custom-vars.lisp:325
+msgid "[Global] return"
+msgstr "[Á´ÂÎ] ¥ê¥¿¡¼¥ó"
+
 #: scm/custom-vars.lisp:339 scm/custom-vars.lisp:383 scm/custom-vars.lisp:512
 #: scm/custom-vars.lisp:639
 msgid "Use candidate window"
@@ -1356,9 +1441,6 @@
 #~ msgid "tools menu"
 #~ msgstr "¥Ä¡¼¥ë¥á¥Ë¥å¡¼"
 
-#~ msgid "IM switcher"
-#~ msgstr "IMÀÚÂؤ¨"
-
 #~ msgid "input pad"
 #~ msgstr "ÆþÎϥѥåÉ"
 

Modified: trunk/po/uim.pot
===================================================================
--- trunk/po/uim.pot	2005-01-11 20:47:12 UTC (rev 261)
+++ trunk/po/uim.pot	2005-01-11 22:55:05 UTC (rev 262)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-12 05:32+0900\n"
+"POT-Creation-Date: 2005-01-12 06:34+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -499,20 +499,20 @@
 
 #: scm/custom-vars.lisp:59 scm/custom-vars.lisp:63 scm/custom-vars.lisp:70
 #: scm/custom-vars.lisp:76 scm/custom-vars.lisp:94 scm/custom-vars.lisp:172
-#: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:205
-#: scm/custom-vars.lisp:214 scm/custom-vars.lisp:218 scm/custom-vars.lisp:340
-#: scm/custom-vars.lisp:346 scm/custom-vars.lisp:352 scm/custom-vars.lisp:358
-#: scm/custom-vars.lisp:364 scm/custom-vars.lisp:370 scm/custom-vars.lisp:384
-#: scm/custom-vars.lisp:390 scm/custom-vars.lisp:396 scm/custom-vars.lisp:402
-#: scm/custom-vars.lisp:408 scm/custom-vars.lisp:415 scm/custom-vars.lisp:421
-#: scm/custom-vars.lisp:427 scm/custom-vars.lisp:493 scm/custom-vars.lisp:500
-#: scm/custom-vars.lisp:507 scm/custom-vars.lisp:513 scm/custom-vars.lisp:519
-#: scm/custom-vars.lisp:525 scm/custom-vars.lisp:533 scm/custom-vars.lisp:539
-#: scm/custom-vars.lisp:545 scm/custom-vars.lisp:551 scm/custom-vars.lisp:557
-#: scm/custom-vars.lisp:563 scm/custom-vars.lisp:589 scm/custom-vars.lisp:595
-#: scm/custom-vars.lisp:601 scm/custom-vars.lisp:607 scm/custom-vars.lisp:613
-#: scm/custom-vars.lisp:620 scm/custom-vars.lisp:634 scm/custom-vars.lisp:640
-#: scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
+#: scm/custom-vars.lisp:179 scm/custom-vars.lisp:185 scm/custom-vars.lisp:191
+#: scm/custom-vars.lisp:205 scm/custom-vars.lisp:214 scm/custom-vars.lisp:218
+#: scm/custom-vars.lisp:340 scm/custom-vars.lisp:346 scm/custom-vars.lisp:352
+#: scm/custom-vars.lisp:358 scm/custom-vars.lisp:364 scm/custom-vars.lisp:370
+#: scm/custom-vars.lisp:384 scm/custom-vars.lisp:390 scm/custom-vars.lisp:396
+#: scm/custom-vars.lisp:402 scm/custom-vars.lisp:408 scm/custom-vars.lisp:415
+#: scm/custom-vars.lisp:421 scm/custom-vars.lisp:427 scm/custom-vars.lisp:493
+#: scm/custom-vars.lisp:500 scm/custom-vars.lisp:507 scm/custom-vars.lisp:513
+#: scm/custom-vars.lisp:519 scm/custom-vars.lisp:525 scm/custom-vars.lisp:533
+#: scm/custom-vars.lisp:539 scm/custom-vars.lisp:545 scm/custom-vars.lisp:551
+#: scm/custom-vars.lisp:557 scm/custom-vars.lisp:563 scm/custom-vars.lisp:589
+#: scm/custom-vars.lisp:595 scm/custom-vars.lisp:601 scm/custom-vars.lisp:607
+#: scm/custom-vars.lisp:613 scm/custom-vars.lisp:620 scm/custom-vars.lisp:634
+#: scm/custom-vars.lisp:640 scm/custom-vars.lisp:646 scm/custom-vars.lisp:652
 msgid "long description will be here."
 msgstr ""
 
@@ -540,6 +540,10 @@
 msgid "Enable IM switching by hotkey"
 msgstr ""
 
+#: scm/custom-vars.lisp:190
+msgid "IM switching key"
+msgstr ""
+
 #: scm/custom-vars.lisp:202 scm/custom-vars.lisp:531
 msgid "uim"
 msgstr ""
@@ -568,6 +572,87 @@
 msgid "Global key bindings"
 msgstr ""
 
+#: scm/custom-vars.lisp:223
+msgid "[Global] on"
+msgstr ""
+
+#: scm/custom-vars.lisp:224 scm/custom-vars.lisp:230 scm/custom-vars.lisp:236
+#: scm/custom-vars.lisp:242 scm/custom-vars.lisp:248 scm/custom-vars.lisp:254
+#: scm/custom-vars.lisp:260 scm/custom-vars.lisp:266 scm/custom-vars.lisp:272
+#: scm/custom-vars.lisp:278 scm/custom-vars.lisp:284 scm/custom-vars.lisp:290
+#: scm/custom-vars.lisp:296 scm/custom-vars.lisp:302 scm/custom-vars.lisp:308
+#: scm/custom-vars.lisp:314 scm/custom-vars.lisp:320 scm/custom-vars.lisp:326
+msgid "long description will be here"
+msgstr ""
+
+#: scm/custom-vars.lisp:229
+msgid "[Global] off"
+msgstr ""
+
+#: scm/custom-vars.lisp:235
+msgid "[Global] begin conversion"
+msgstr ""
+
+#: scm/custom-vars.lisp:241
+msgid "[Global] commit"
+msgstr ""
+
+#: scm/custom-vars.lisp:247
+msgid "[Global] cancel"
+msgstr ""
+
+#: scm/custom-vars.lisp:253
+msgid "[Global] next candidate"
+msgstr ""
+
+#: scm/custom-vars.lisp:259
+msgid "[Global] previous candidate"
+msgstr ""
+
+#: scm/custom-vars.lisp:265
+msgid "[Global] next page of candidate window"
+msgstr ""
+
+#: scm/custom-vars.lisp:271
+msgid "[Global] previous page of candidate window"
+msgstr ""
+
+#: scm/custom-vars.lisp:277
+msgid "[Global] beginning of preedit"
+msgstr ""
+
+#: scm/custom-vars.lisp:283
+msgid "[Global] end of preedit"
+msgstr ""
+
+#: scm/custom-vars.lisp:289
+msgid "[Global] erase after cursor"
+msgstr ""
+
+#: scm/custom-vars.lisp:295
+msgid "[Global] erase before cursor"
+msgstr ""
+
+#: scm/custom-vars.lisp:301
+msgid "[Global] backspace"
+msgstr ""
+
+#: scm/custom-vars.lisp:307
+msgid "[Global] delete"
+msgstr ""
+
+#: scm/custom-vars.lisp:313
+msgid "[Global] left"
+msgstr ""
+
+#: scm/custom-vars.lisp:319
+msgid "[Global] right"
+msgstr ""
+
+#: scm/custom-vars.lisp:325
+msgid "[Global] return"
+msgstr ""
+
 #: scm/custom-vars.lisp:339 scm/custom-vars.lisp:383 scm/custom-vars.lisp:512
 #: scm/custom-vars.lisp:639
 msgid "Use candidate window"

Modified: trunk/scm/custom-vars.scm
===================================================================
--- trunk/scm/custom-vars.scm	2005-01-11 20:47:12 UTC (rev 261)
+++ trunk/scm/custom-vars.scm	2005-01-11 22:55:05 UTC (rev 262)
@@ -184,11 +184,11 @@
   (_ "Enable IM switching by hotkey")
   (_ "long description will be here."))
 
-;;(define-custom 'switch-im-key? '("<Control>Shift_key" "<Shift>Control_key")
-;;  '(global im-switching advanced)
-;;  '(key)
-;;  "IM switching key"
-;;  "long description will be here.")
+(define-custom 'switch-im-key '("<Control>Shift_key" "<Shift>Control_key")
+  '(global im-switching advanced)
+  '(key)
+  (_ "IM switching key")
+  (_ "long description will be here."))
 
 ;; activity dependency
 (custom-add-hook 'switch-im-key?
@@ -220,110 +220,110 @@
 (define-custom 'generic-on-key '("zenkaku-hankaku" "<Shift> ")
                '(global-keys key)
 	       '(key)
-	       "[Global] on"
-	       "long description will be here")
+	       (_ "[Global] on")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-off-key '("zenkaku-hankaku" "<Shift> ")
                '(global-keys key)
 	       '(key)
-	       "[Global] off"
-	       "long description will be here")
+	       (_ "[Global] off")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-begin-conv-key '(" ")
                '(global-keys key)
 	       '(key)
-	       "[Global] begin conversion"
-	       "long description will be here")
+	       (_ "[Global] begin conversion")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-commit-key '("<Control>j" "<Control>J" generic-return-key)
                '(global-keys key)
 	       '(key)
-	       "[Global] commit"
-	       "long description will be here")
+	       (_ "[Global] commit")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-cancel-key '("escape" "<Control>g" "<Control>G")
                '(global-keys key)
 	       '(key)
-	       "[Global] cancel"
-	       "long description will be here")
+	       (_ "[Global] cancel")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-next-candidate-key '(" " "down" "<Control>n" "<Control>N")
                '(global-keys key)
 	       '(key)
-	       "[Global] next candidate"
-	       "long description will be here")
+	       (_ "[Global] next candidate")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-prev-candidate-key '("up" "<Control>p" "<Control>P")
                '(global-keys key)
 	       '(key)
-	       "[Global] previous candidate"
-	       "long description will be here")
+	       (_ "[Global] previous candidate")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-next-page-key '("next")
                '(global-keys key)
 	       '(key)
-	       "[Global] next page of candidate window"
-	       "long description will be here")
+	       (_ "[Global] next page of candidate window")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-prev-page-key '("prior")
                '(global-keys key)
 	       '(key)
-	       "[Global] previous page of candidate window"
-	       "long description will be here")
+	       (_ "[Global] previous page of candidate window")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-beginning-of-preedit-key '("home" "<Control>a" "<Control>A")
                '(global-keys key)
 	       '(key)
-	       "[Global] beginning of preedit"
-	       "long description will be here")
+	       (_ "[Global] beginning of preedit")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-end-of-preedit-key '("end" "<Control>e" "<Control>E")
                '(global-keys key)
 	       '(key)
-	       "[Global] end of preedit"
-	       "long description will be here")
+	       (_ "[Global] end of preedit")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-kill-key '("<Control>k" "<Control>K")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] erase after cursor"
-	       "long description will be here")
+	       (_ "[Global] erase after cursor")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-kill-backward-key '("<Control>u" "<Control>U")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] erase before cursor"
-	       "long description will be here")
+	       (_ "[Global] erase before cursor")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-backspace-key '("backspace" "<Control>h" "<Control>H")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] backspace"
-	       "long description will be here")
+	       (_ "[Global] backspace")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-delete-key '("delete" "<Control>d" "<Control>D")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] delete"
-	       "long description will be here")
+	       (_ "[Global] delete")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-go-left-key '("left" "<Control>b" "<Control>B")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] left"
-	       "long description will be here")
+	       (_ "[Global] left")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-go-right-key '("right" "<Control>f" "<Control>F")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] right"
-	       "long description will be here")
+	       (_ "[Global] right")
+	       (_ "long description will be here"))
 
 (define-custom 'generic-return-key '("return" "<Control>m" "<Control>M")
                '(global-keys key advanced)
 	       '(key)
-	       "[Global] return"
-	       "long description will be here")
+	       (_ "[Global] return")
+	       (_ "long description will be here"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -485,27 +485,6 @@
 		     skk-im-canonical-name
 		     "TODO: share im-short-desc of the IM")
 
-(define-custom 'skk-dic-file-name (string-append (sys-datadir)
-						 "/skk/SKK-JISYO.L")
-  '(skk)
-  '(pathname)
-  (_ "Dictionary file")
-  (_ "long description will be here."))
-
-(define-custom 'skk-personal-dic-filename
-  (string-append (getenv "HOME") "/.skk-jisyo")
-  '(skk)
-  '(pathname)
-  (_ "Personal dictionary file")
-  (_ "long description will be here."))
-
-(define-custom 'skk-uim-personal-dic-filename
-  (string-append (getenv "HOME") "/.skk-uim-jisyo")
-  '(skk)
-  '(pathname)
-  (_ "Personal dictionary file (dedicated to uim)")
-  (_ "long description will be here."))
-
 (define-custom 'skk-use-candidate-window? #t
   '(skk)
   '(boolean)
@@ -562,6 +541,27 @@
   (_ "Friendly for vi user")
   (_ "long description will be here."))
 
+(define-custom 'skk-dic-file-name (string-append (sys-datadir)
+						 "/skk/SKK-JISYO.L")
+  '(skk)
+  '(pathname)
+  (_ "Dictionary file")
+  (_ "long description will be here."))
+
+(define-custom 'skk-personal-dic-filename
+  (string-append (getenv "HOME") "/.skk-jisyo")
+  '(skk)
+  '(pathname)
+  (_ "Personal dictionary file")
+  (_ "long description will be here."))
+
+(define-custom 'skk-uim-personal-dic-filename
+  (string-append (getenv "HOME") "/.skk-uim-jisyo")
+  '(skk)
+  '(pathname)
+  (_ "Personal dictionary file (dedicated to uim)")
+  (_ "long description will be here."))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; prime

Modified: trunk/uim/uim-compat-scm.c
===================================================================
--- trunk/uim/uim-compat-scm.c	2005-01-11 20:47:12 UTC (rev 261)
+++ trunk/uim/uim-compat-scm.c	2005-01-11 22:55:05 UTC (rev 262)
@@ -274,9 +274,7 @@
 char *
 uim_scm_c_str_failsafe(uim_lisp str)
 {
-  char *c_str;
-  c_str = uim_scm_c_str(str);
-  return (c_str) ? c_str : strdup("");
+  return (NFALSEP(str)) ? uim_scm_c_str(str) : strdup("");
 }
 
 char **

Modified: trunk/uim/uim-custom.c
===================================================================
--- trunk/uim/uim-custom.c	2005-01-11 20:47:12 UTC (rev 261)
+++ trunk/uim/uim-custom.c	2005-01-11 22:55:05 UTC (rev 262)
@@ -335,7 +335,7 @@
   int *key_type_list, editor_type, list_len, i;
   struct uim_custom_key *custom_key, **custom_key_list;
 
-  UIM_EVAL_FSTRING2(NULL, "(define %s (apply (if uim-custom-expand-key? custom-expand-key-references list) (custom-value '%s))",
+  UIM_EVAL_FSTRING2(NULL, "(define %s (apply (if uim-custom-expand-key? custom-expand-key-references list) (custom-value '%s)))",
 		    str_list_arg, custom_sym);
   key_literal_list =
     (char **)uim_scm_c_list(str_list_arg,
@@ -348,11 +348,11 @@
   key_label_list =
     (char **)uim_scm_c_list(str_list_arg,
 			    "(lambda (key) (if (symbol? key) (custom-label key) #f))",
-			    (uim_scm_c_list_conv_func)uim_scm_c_str);
+			    (uim_scm_c_list_conv_func)uim_scm_c_str_failsafe);
   key_desc_list =
     (char **)uim_scm_c_list(str_list_arg,
 			    "(lambda (key) (if (symbol? key) (custom-desc key) #f))",
-			    (uim_scm_c_list_conv_func)uim_scm_c_str);
+			    (uim_scm_c_list_conv_func)uim_scm_c_str_failsafe);
   if (!key_type_list || !key_literal_list || !key_label_list || !key_desc_list)
   {
     free(key_type_list);
@@ -1230,7 +1230,7 @@
 {
   uim_bool removed;
 
-  UIM_EVAL_FSTRING1(NULL, "(custom-remove-hook '%s 'custom-update-hook)",
+  UIM_EVAL_FSTRING1(NULL, "(custom-remove-hook '%s 'custom-update-hooks)",
 		    (custom_sym) ? custom_sym : "#f");
   removed = uim_scm_c_bool(uim_scm_return_value());

More information about the Uim-commit mailing list