[uim] r6922 committed - * Merge r6917, 6919 from trunk.

[codesite-noreply]

Revision: 6922
Author: ek.kato
Date: Sun Jan 16 20:26:57 2011
Log: * Merge r6917, 6919 from trunk.
http://code.google.com/p/uim/source/detail?r=6922

Modified:
 /branches/1.6/po
 /branches/1.6/po/ja.po
 /branches/1.6/uim/uim-func.c

=======================================
--- /branches/1.6/po/ja.po      Thu Jan  6 18:17:32 2011
+++ /branches/1.6/po/ja.po      Sun Jan 16 20:26:57 2011
@@ -5881,7 +5881,7 @@

 #: ../scm/tutcode-key-custom.scm:113
 msgid "[TUT-Code] commit as katakana in yomi input of mazegaki"
-msgstr "交ぜ書き変換の読みをカタカナとして確定する"
+msgstr "[TUT-Code] 交ぜ書き変換の読みをカタカナとして確定する"

 #: ../scm/tutcode-key-custom.scm:119
 msgid "[TUT-Code] toggle use of stroke help window"
=======================================
--- /branches/1.6/uim/uim-func.c        Thu Jan  6 18:17:32 2011
+++ /branches/1.6/uim/uim-func.c        Sun Jan 16 20:26:57 2011
@@ -367,9 +367,9 @@
   free(former);
   free(latter);
   former_
-    = (TEXT_EMPTYP(cv_former)) ? uim_scm_null() :  
MAKE_STR_DIRECTLY(cv_former);
+    = (TEXT_EMPTYP(cv_former)) ? uim_scm_null() :  
LIST1(MAKE_STR_DIRECTLY(cv_former));
   latter_
-    = (TEXT_EMPTYP(cv_latter)) ? uim_scm_null() :  
MAKE_STR_DIRECTLY(cv_latter);
+    = (TEXT_EMPTYP(cv_latter)) ? uim_scm_null() :  
LIST1(MAKE_STR_DIRECTLY(cv_latter));

   return uim_scm_callf("ustr-new", "oo", former_, latter_);
 }