Revision: 7455 Author: ek.kato Date: Mon Feb 13 18:18:45 2012 Log: * Merge r7454 from trunk.
http://code.google.com/p/uim/source/detail?r=7455 Modified: /branches/1.7/emacs/context.c /branches/1.7/emacs/im.c /branches/1.7/emacs/uim-el-agent.c ======================================= --- /branches/1.7/emacs/context.c Wed Jan 11 00:24:17 2012 +++ /branches/1.7/emacs/context.c Mon Feb 13 18:18:45 2012 @@ -230,7 +230,7 @@ ret->context = create_context(ret->encoding, ret); - if ((im = uim_get_default_im_name(setlocale(LC_ALL, NULL)))) + if ((im = uim_get_default_im_name(setlocale(LC_CTYPE, NULL)))) ret->im = uim_strdup(im); else ret->im = NULL; ======================================= --- /branches/1.7/emacs/im.c Wed Jan 11 00:24:17 2012 +++ /branches/1.7/emacs/im.c Mon Feb 13 18:18:45 2012 @@ -58,7 +58,7 @@ a_printf(" ( d \"%s\" ) ", default_engine_name); else a_printf(" ( d \"%s\" ) ", - uim_get_default_im_name(setlocale(LC_ALL, NULL))); + uim_get_default_im_name(setlocale(LC_CTYPE, NULL))); } ======================================= --- /branches/1.7/emacs/uim-el-agent.c Wed Jan 11 00:24:17 2012 +++ /branches/1.7/emacs/uim-el-agent.c Mon Feb 13 18:18:45 2012 @@ -630,6 +630,8 @@ { int opt; + setlocale(LC_CTYPE, ""); + while ((opt = getopt(argc, argv, "d")) != -1) { switch (opt) { case 'd':
