Mercurial > hg > xemacs-beta

comparison src/mule-wnnfns.c @ 129:e292c9648bb9 xemacs-20-1p3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag xemacs-20-1p3
author cvs
date Mon, 13 Aug 2007 09:28:38 +0200
parents 1370575f1259
children 34a5b81f86ba
comparison
equal deleted inserted replaced
128:13db4aa44a2e 129:e292c9648bb9
697 if ((snum = check_wnn_server_type ()) == -1) return Qnil; 697 if ((snum = check_wnn_server_type ()) == -1) return Qnil;
698 if (!wnnfns_buf[snum]) return Qnil; 698 if (!wnnfns_buf[snum]) return Qnil;
699 no = XINT (bunNo); 699 no = XINT (bunNo);
700 #ifdef WNN6 700 #ifdef WNN6
701 if ((cnt = jl_fi_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE, 701 if ((cnt = jl_fi_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
702 (dai == Qnil) ? WNN_SHO : WNN_DAI)) < 0) 702 (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0)
703 return Qnil; 703 return Qnil;
704 #else 704 #else
705 if ((cnt = jl_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE, 705 if ((cnt = jl_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
706 (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0) 706 (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0)
707 return Qnil; 707 return Qnil;
1267 { 1267 {
1268 struct gcpro gcpro1; 1268 struct gcpro gcpro1;
1269 int snum; 1269 int snum;
1270 CHECK_STRING (args[0]); 1270 CHECK_STRING (args[0]);
1271 CHECK_STRING (args[1]); 1271 CHECK_STRING (args[1]);
1272 if (args[3] != Qnil) CHECK_STRING (args[3]); 1272 if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
1273 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1273 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1274 if(!wnnfns_buf[snum]) return Qnil; 1274 if(!wnnfns_buf[snum]) return Qnil;
1275 GCPRO1 (*args); 1275 GCPRO1 (*args);
1276 gcpro1.nvars = nargs; 1276 gcpro1.nvars = nargs;
1277 if(jl_fi_dic_add(wnnfns_buf[snum], 1277 if(jl_fi_dic_add(wnnfns_buf[snum],
1278 XSTRING(args[0])->_data, 1278 XSTRING(args[0])->_data,
1279 XSTRING(args[1])->_data, 1279 XSTRING(args[1])->_data,
1280 WNN_FI_SYSTEM_DICT, 1280 WNN_FI_SYSTEM_DICT,
1281 WNN_DIC_RDONLY, 1281 WNN_DIC_RDONLY,
1282 (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW, 1282 (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
1283 0, 1283 0,
1284 (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data, 1284 (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
1285 yes_or_no, 1285 yes_or_no,
1286 puts2 ) < 0) { 1286 puts2 ) < 0) {
1287 UNGCPRO; 1287 UNGCPRO;
1288 return Qnil; 1288 return Qnil;
1289 } 1289 }
1300 { 1300 {
1301 struct gcpro gcpro1; 1301 struct gcpro gcpro1;
1302 int snum; 1302 int snum;
1303 CHECK_STRING (args[0]); 1303 CHECK_STRING (args[0]);
1304 CHECK_STRING (args[1]); 1304 CHECK_STRING (args[1]);
1305 if (args[4] != Qnil) CHECK_STRING (args[4]); 1305 if (!EQ(args[4], Qnil)) CHECK_STRING (args[4]);
1306 if (args[5] != Qnil) CHECK_STRING (args[5]); 1306 if (!EQ(args[5], Qnil)) CHECK_STRING (args[5]);
1307 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1307 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1308 if(!wnnfns_buf[snum]) return Qnil; 1308 if(!wnnfns_buf[snum]) return Qnil;
1309 GCPRO1 (*args); 1309 GCPRO1 (*args);
1310 gcpro1.nvars = nargs; 1310 gcpro1.nvars = nargs;
1311 if(jl_fi_dic_add(wnnfns_buf[snum], 1311 if(jl_fi_dic_add(wnnfns_buf[snum],
1312 XSTRING(args[0])->_data, 1312 XSTRING(args[0])->_data,
1313 XSTRING(args[1])->_data, 1313 XSTRING(args[1])->_data,
1314 WNN_FI_USER_DICT, 1314 WNN_FI_USER_DICT,
1315 (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW, 1315 (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
1316 (args[3] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW, 1316 (EQ(args[3], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
1317 (args[4] == Qnil) ? 0 : XSTRING(args[4])->_data, 1317 (EQ(args[4], Qnil)) ? 0 : XSTRING(args[4])->_data,
1318 (args[5] == Qnil) ? 0 : XSTRING(args[5])->_data, 1318 (EQ(args[5], Qnil)) ? 0 : XSTRING(args[5])->_data,
1319 yes_or_no, 1319 yes_or_no,
1320 puts2 ) < 0) { 1320 puts2 ) < 0) {
1321 UNGCPRO; 1321 UNGCPRO;
1322 return Qnil; 1322 return Qnil;
1323 } 1323 }
1337 struct wnn_env *cur_env; 1337 struct wnn_env *cur_env;
1338 unsigned long vmask = 0; 1338 unsigned long vmask = 0;
1339 struct wnn_henkan_env henv; 1339 struct wnn_henkan_env henv;
1340 CHECK_STRING (args[0]); 1340 CHECK_STRING (args[0]);
1341 CHECK_INT (args[1]); 1341 CHECK_INT (args[1]);
1342 if (args[3] != Qnil) CHECK_STRING (args[3]); 1342 if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
1343 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1343 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1344 if(!wnnfns_buf[snum]) return Qnil; 1344 if(!wnnfns_buf[snum]) return Qnil;
1345 GCPRO1 (*args); 1345 GCPRO1 (*args);
1346 gcpro1.nvars = nargs; 1346 gcpro1.nvars = nargs;
1347 if(wnnfns_norm) 1347 if(wnnfns_norm)
1354 XSTRING(args[0])->_data, 1354 XSTRING(args[0])->_data,
1355 0, 1355 0,
1356 wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV, 1356 wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
1357 XINT(args[1]), 1357 XINT(args[1]),
1358 WNN_DIC_RW, WNN_DIC_RW, 1358 WNN_DIC_RW, WNN_DIC_RW,
1359 (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data, 1359 (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
1360 0, 1360 0,
1361 yes_or_no, 1361 yes_or_no,
1362 puts2)) < 0) { 1362 puts2)) < 0) {
1363 UNGCPRO; 1363 UNGCPRO;
1364 return Qnil; 1364 return Qnil;
1371 UNGCPRO; 1371 UNGCPRO;
1372 return Qnil; 1372 return Qnil;
1373 } 1373 }
1374 } 1374 }
1375 vmask |= WNN_ENV_MUHENKAN_LEARN_MASK; 1375 vmask |= WNN_ENV_MUHENKAN_LEARN_MASK;
1376 henv.muhenkan_flag = (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW; 1376 henv.muhenkan_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
1377 if(jl_set_henkan_env(wnnfns_buf[snum], 1377 if(jl_set_henkan_env(wnnfns_buf[snum],
1378 vmask, 1378 vmask,
1379 &henv) < 0) { 1379 &henv) < 0) {
1380 UNGCPRO; 1380 UNGCPRO;
1381 return Qnil; 1381 return Qnil;
1396 struct wnn_env *cur_env; 1396 struct wnn_env *cur_env;
1397 unsigned long vmask = 0; 1397 unsigned long vmask = 0;
1398 struct wnn_henkan_env henv; 1398 struct wnn_henkan_env henv;
1399 CHECK_STRING (args[0]); 1399 CHECK_STRING (args[0]);
1400 CHECK_INT (args[1]); 1400 CHECK_INT (args[1]);
1401 if (args[3] != Qnil) CHECK_STRING (args[3]); 1401 if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
1402 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1402 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1403 if(!wnnfns_buf[snum]) return Qnil; 1403 if(!wnnfns_buf[snum]) return Qnil;
1404 GCPRO1 (*args); 1404 GCPRO1 (*args);
1405 gcpro1.nvars = nargs; 1405 gcpro1.nvars = nargs;
1406 if(wnnfns_norm) 1406 if(wnnfns_norm)
1413 XSTRING(args[0])->_data, 1413 XSTRING(args[0])->_data,
1414 0, 1414 0,
1415 wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV, 1415 wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
1416 XINT(args[1]), 1416 XINT(args[1]),
1417 WNN_DIC_RW, WNN_DIC_RW, 1417 WNN_DIC_RW, WNN_DIC_RW,
1418 (args[3] == Qnil) ? 0 : XSTRING(args[3])->_data, 1418 (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
1419 0, 1419 0,
1420 yes_or_no, 1420 yes_or_no,
1421 puts2)) < 0) { 1421 puts2)) < 0) {
1422 UNGCPRO; 1422 UNGCPRO;
1423 return Qnil; 1423 return Qnil;
1430 UNGCPRO; 1430 UNGCPRO;
1431 return Qnil; 1431 return Qnil;
1432 } 1432 }
1433 } 1433 }
1434 vmask |= WNN_ENV_BUNSETSUGIRI_LEARN_MASK; 1434 vmask |= WNN_ENV_BUNSETSUGIRI_LEARN_MASK;
1435 henv.bunsetsugiri_flag = (args[2] == Qnil) ? WNN_DIC_RDONLY : WNN_DIC_RW; 1435 henv.bunsetsugiri_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
1436 if(jl_set_henkan_env(wnnfns_buf[snum], 1436 if(jl_set_henkan_env(wnnfns_buf[snum],
1437 vmask, 1437 vmask,
1438 &henv) < 0) { 1438 &henv) < 0) {
1439 UNGCPRO; 1439 UNGCPRO;
1440 return Qnil; 1440 return Qnil;
1452 unsigned long vmask = 0; 1452 unsigned long vmask = 0;
1453 struct wnn_henkan_env henv; 1453 struct wnn_henkan_env henv;
1454 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1454 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1455 if(!wnnfns_buf[snum]) return Qnil; 1455 if(!wnnfns_buf[snum]) return Qnil;
1456 vmask |= WNN_ENV_LAST_IS_FIRST_MASK; 1456 vmask |= WNN_ENV_LAST_IS_FIRST_MASK;
1457 henv.last_is_first_flag = (mode == Qnil) ? False : True; 1457 henv.last_is_first_flag = (EQ(mode, Qnil)) ? False : True;
1458 if(jl_set_henkan_env(wnnfns_buf[snum], 1458 if(jl_set_henkan_env(wnnfns_buf[snum],
1459 vmask, 1459 vmask,
1460 &henv) < 0) return Qnil; 1460 &henv) < 0) return Qnil;
1461 return Qt; 1461 return Qt;
1462 } 1462 }
1470 unsigned long vmask = 0; 1470 unsigned long vmask = 0;
1471 struct wnn_henkan_env henv; 1471 struct wnn_henkan_env henv;
1472 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1472 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1473 if(!wnnfns_buf[snum]) return Qnil; 1473 if(!wnnfns_buf[snum]) return Qnil;
1474 vmask |= WNN_ENV_COMPLEX_CONV_MASK; 1474 vmask |= WNN_ENV_COMPLEX_CONV_MASK;
1475 henv.complex_flag = (mode == Qnil) ? False : True; 1475 henv.complex_flag = (EQ(mode, Qnil)) ? False : True;
1476 if(jl_set_henkan_env(wnnfns_buf[snum], 1476 if(jl_set_henkan_env(wnnfns_buf[snum],
1477 vmask, 1477 vmask,
1478 &henv) < 0) return Qnil; 1478 &henv) < 0) return Qnil;
1479 return Qt; 1479 return Qt;
1480 } 1480 }
1488 unsigned long vmask = 0; 1488 unsigned long vmask = 0;
1489 struct wnn_henkan_env henv; 1489 struct wnn_henkan_env henv;
1490 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1490 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1491 if(!wnnfns_buf[snum]) return Qnil; 1491 if(!wnnfns_buf[snum]) return Qnil;
1492 vmask |= WNN_ENV_OKURI_LEARN_MASK; 1492 vmask |= WNN_ENV_OKURI_LEARN_MASK;
1493 henv.okuri_learn_flag = (mode == Qnil) ? False : True; 1493 henv.okuri_learn_flag = (EQ(mode, Qnil)) ? False : True;
1494 if(jl_set_henkan_env(wnnfns_buf[snum], 1494 if(jl_set_henkan_env(wnnfns_buf[snum],
1495 vmask, 1495 vmask,
1496 &henv) < 0) return Qnil; 1496 &henv) < 0) return Qnil;
1497 return Qt; 1497 return Qt;
1498 } 1498 }
1499 1499
1500 DEFUN ("wnn-server-set-okuri-flag", Fwnn_okuri_flag, 1, 1, 0, /* 1500 DEFUN ("wnn-server-set-okuri-flag", Fwnn_okuri_flag, 1, 1, 0, /*
1501 For FI-Wnn. 1501 For FI-Wnn.
1502 */ 1502 */
1503 (mode)) 1503 (lmode))
1504 { 1504 {
1505 int snum; 1505 int snum, mode;
1506 unsigned long vmask = 0; 1506 unsigned long vmask = 0;
1507 struct wnn_henkan_env henv; 1507 struct wnn_henkan_env henv;
1508 CHECK_INT (mode); 1508 CHECK_INT (lmode);
1509 mode = XINT (lmode);
1509 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1510 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1510 if(!wnnfns_buf[snum]) return Qnil; 1511 if(!wnnfns_buf[snum]) return Qnil;
1511 if(mode != WNN_OKURI_REGULATION && 1512 if(mode != WNN_OKURI_REGULATION &&
1512 mode != WNN_OKURI_NO && 1513 mode != WNN_OKURI_NO &&
1513 mode != WNN_OKURI_YES) 1514 mode != WNN_OKURI_YES)
1530 unsigned long vmask = 0; 1531 unsigned long vmask = 0;
1531 struct wnn_henkan_env henv; 1532 struct wnn_henkan_env henv;
1532 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1533 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1533 if(!wnnfns_buf[snum]) return Qnil; 1534 if(!wnnfns_buf[snum]) return Qnil;
1534 vmask |= WNN_ENV_PREFIX_LEARN_MASK; 1535 vmask |= WNN_ENV_PREFIX_LEARN_MASK;
1535 henv.prefix_learn_flag = (mode == Qnil) ? False : True; 1536 henv.prefix_learn_flag = (EQ(mode, Qnil)) ? False : True;
1536 if(jl_set_henkan_env(wnnfns_buf[snum], 1537 if(jl_set_henkan_env(wnnfns_buf[snum],
1537 vmask, 1538 vmask,
1538 &henv) < 0) return Qnil; 1539 &henv) < 0) return Qnil;
1539 return Qt; 1540 return Qt;
1540 } 1541 }
1541 1542
1542 DEFUN ("wnn-server-set-prefix-flag", Fwnn_prefix_flag, 1, 1, 0, /* 1543 DEFUN ("wnn-server-set-prefix-flag", Fwnn_prefix_flag, 1, 1, 0, /*
1543 For FI-Wnn. 1544 For FI-Wnn.
1544 */ 1545 */
1545 (mode)) 1546 (lmode))
1546 { 1547 {
1547 int snum; 1548 int snum, mode;
1548 unsigned long vmask = 0; 1549 unsigned long vmask = 0;
1549 struct wnn_henkan_env henv; 1550 struct wnn_henkan_env henv;
1550 CHECK_INT (mode); 1551 CHECK_INT (lmode);
1552 mode = XINT (lmode);
1551 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1553 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1552 if(!wnnfns_buf[snum]) return Qnil; 1554 if(!wnnfns_buf[snum]) return Qnil;
1553 if(mode != WNN_KANA_KOUHO && mode != WNN_KANJI_KOUHO) 1555 if(mode != WNN_KANA_KOUHO && mode != WNN_KANJI_KOUHO)
1554 return Qnil; 1556 return Qnil;
1555 else 1557 else
1570 unsigned long vmask = 0; 1572 unsigned long vmask = 0;
1571 struct wnn_henkan_env henv; 1573 struct wnn_henkan_env henv;
1572 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1574 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1573 if(!wnnfns_buf[snum]) return Qnil; 1575 if(!wnnfns_buf[snum]) return Qnil;
1574 vmask |= WNN_ENV_SUFFIX_LEARN_MASK; 1576 vmask |= WNN_ENV_SUFFIX_LEARN_MASK;
1575 henv.suffix_learn_flag = (mode == Qnil) ? False : True; 1577 henv.suffix_learn_flag = (EQ(mode, Qnil)) ? False : True;
1576 if(jl_set_henkan_env(wnnfns_buf[snum], 1578 if(jl_set_henkan_env(wnnfns_buf[snum],
1577 vmask, 1579 vmask,
1578 &henv) < 0) return Qnil; 1580 &henv) < 0) return Qnil;
1579 return Qt; 1581 return Qt;
1580 } 1582 }
1588 unsigned long vmask = 0; 1590 unsigned long vmask = 0;
1589 struct wnn_henkan_env henv; 1591 struct wnn_henkan_env henv;
1590 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1592 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1591 if(!wnnfns_buf[snum]) return Qnil; 1593 if(!wnnfns_buf[snum]) return Qnil;
1592 vmask |= WNN_ENV_COMMON_LAERN_MASK; 1594 vmask |= WNN_ENV_COMMON_LAERN_MASK;
1593 henv.common_learn_flag = (mode == Qnil) ? False : True; 1595 henv.common_learn_flag = (EQ(mode, Qnil)) ? False : True;
1594 if(jl_set_henkan_env(wnnfns_buf[snum], 1596 if(jl_set_henkan_env(wnnfns_buf[snum],
1595 vmask, 1597 vmask,
1596 &henv) < 0) return Qnil; 1598 &henv) < 0) return Qnil;
1597 return Qt; 1599 return Qt;
1598 } 1600 }
1599 1601
1600 DEFUN ("wnn-server-set-freq-func-mode", Fwnn_freq_func, 1, 1, 0, /* 1602 DEFUN ("wnn-server-set-freq-func-mode", Fwnn_freq_func, 1, 1, 0, /*
1601 For FI-Wnn. 1603 For FI-Wnn.
1602 */ 1604 */
1603 (mode)) 1605 (lmode))
1604 { 1606 {
1605 int snum; 1607 int snum, mode;
1606 unsigned long vmask = 0; 1608 unsigned long vmask = 0;
1607 struct wnn_henkan_env henv; 1609 struct wnn_henkan_env henv;
1608 CHECK_INT (mode); 1610 CHECK_INT (lmode);
1611 mode = XINT (lmode);
1609 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1612 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1610 if(!wnnfns_buf[snum]) return Qnil; 1613 if(!wnnfns_buf[snum]) return Qnil;
1611 if(mode != 0 && mode != 1 && mode != 2 && mode != 3 && mode != 4) 1614 if(mode != 0 && mode != 1 && mode != 2 && mode != 3 && mode != 4)
1612 return Qnil; 1615 return Qnil;
1613 else 1616 else
1620 } 1623 }
1621 1624
1622 DEFUN ("wnn-server-set-numeric-mode", Fwnn_numeric, 1, 1, 0, /* 1625 DEFUN ("wnn-server-set-numeric-mode", Fwnn_numeric, 1, 1, 0, /*
1623 For FI-Wnn. 1626 For FI-Wnn.
1624 */ 1627 */
1625 (mode)) 1628 (lmode))
1626 { 1629 {
1627 int snum; 1630 int snum, mode;
1628 unsigned long vmask = 0; 1631 unsigned long vmask = 0;
1629 struct wnn_henkan_env henv; 1632 struct wnn_henkan_env henv;
1630 CHECK_INT (mode); 1633 CHECK_INT (lmode);
1634 mode = XINT (lmode);
1631 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1635 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1632 if(!wnnfns_buf[snum]) return Qnil; 1636 if(!wnnfns_buf[snum]) return Qnil;
1633 if(mode != WNN_NUM_KANSUUJI && 1637 if(mode != WNN_NUM_KANSUUJI &&
1634 mode != WNN_NUM_KANOLD && 1638 mode != WNN_NUM_KANOLD &&
1635 mode != WNN_NUM_HANCAN && 1639 mode != WNN_NUM_HANCAN &&
1648 } 1652 }
1649 1653
1650 DEFUN ("wnn-server-set-alphabet-mode", Fwnn_alphabet, 1, 1, 0, /* 1654 DEFUN ("wnn-server-set-alphabet-mode", Fwnn_alphabet, 1, 1, 0, /*
1651 For FI-Wnn. 1655 For FI-Wnn.
1652 */ 1656 */
1653 (mode)) 1657 (lmode))
1654 { 1658 {
1655 int snum; 1659 int snum, mode;
1656 unsigned long vmask = 0; 1660 unsigned long vmask = 0;
1657 struct wnn_henkan_env henv; 1661 struct wnn_henkan_env henv;
1658 CHECK_INT (mode); 1662 CHECK_INT (lmode);
1663 mode = XINT (lmode);
1659 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1664 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1660 if(!wnnfns_buf[snum]) return Qnil; 1665 if(!wnnfns_buf[snum]) return Qnil;
1661 if(mode != WNN_ALP_HAN && mode != WNN_ALP_ZEN) 1666 if(mode != WNN_ALP_HAN && mode != WNN_ALP_ZEN)
1662 return Qnil; 1667 return Qnil;
1663 else 1668 else
1670 } 1675 }
1671 1676
1672 DEFUN ("wnn-server-set-symbol-mode", Fwnn_symbol, 1, 1, 0, /* 1677 DEFUN ("wnn-server-set-symbol-mode", Fwnn_symbol, 1, 1, 0, /*
1673 For FI-Wnn. 1678 For FI-Wnn.
1674 */ 1679 */
1675 (mode)) 1680 (lmode))
1676 { 1681 {
1677 int snum; 1682 int snum, mode;
1678 unsigned long vmask = 0; 1683 unsigned long vmask = 0;
1679 struct wnn_henkan_env henv; 1684 struct wnn_henkan_env henv;
1680 CHECK_INT (mode); 1685 CHECK_INT (lmode);
1686 mode = XINT (lmode);
1681 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1687 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1682 if(!wnnfns_buf[snum]) return Qnil; 1688 if(!wnnfns_buf[snum]) return Qnil;
1683 if(mode != WNN_KIG_HAN && mode != WNN_KIG_JIS && mode != WNN_KIG_ASC) 1689 if(mode != WNN_KIG_HAN && mode != WNN_KIG_JIS && mode != WNN_KIG_ASC)
1684 return Qnil; 1690 return Qnil;
1685 else 1691 else
1700 unsigned long vmask = 0; 1706 unsigned long vmask = 0;
1701 struct wnn_henkan_env henv; 1707 struct wnn_henkan_env henv;
1702 if ((snum = check_wnn_server_type()) == -1) return Qnil; 1708 if ((snum = check_wnn_server_type()) == -1) return Qnil;
1703 if(!wnnfns_buf[snum]) return Qnil; 1709 if(!wnnfns_buf[snum]) return Qnil;
1704 vmask |= WNN_ENV_YURAGI_MASK; 1710 vmask |= WNN_ENV_YURAGI_MASK;
1705 henv.yuragi_flag = (mode == Qnil) ? False : True; 1711 henv.yuragi_flag = (EQ(mode, Qnil)) ? False : True;
1706 if(jl_set_henkan_env(wnnfns_buf[snum], 1712 if(jl_set_henkan_env(wnnfns_buf[snum],
1707 vmask, 1713 vmask,
1708 &henv) < 0) return Qnil; 1714 &henv) < 0) return Qnil;
1709 return Qt; 1715 return Qt;
1710 } 1716 }
2063 if (*s == 0) return 1; 2069 if (*s == 0) return 1;
2064 c2m (s, mbuf, lb); 2070 c2m (s, mbuf, lb);
2065 /* truncate "(Y/N)" */ 2071 /* truncate "(Y/N)" */
2066 for (len = 0; (mbuf[len]) && (len < 512); len++); 2072 for (len = 0; (mbuf[len]) && (len < 512); len++);
2067 for (; (mbuf[len] != '(') && (len > 0); len--); 2073 for (; (mbuf[len] != '(') && (len > 0); len--);
2068 #if 0
2069 if (Fy_or_n_p (make_string (mbuf, len)) == Qnil) return 0;
2070 else return (1);
2071 #else
2072 { 2074 {
2073 Lisp_Object yes, str; 2075 Lisp_Object yes, str;
2074 2076
2075 str = make_string (mbuf, len); 2077 str = make_string (mbuf, len);
2076 yes = call1(Qyes_or_no_p, str); 2078 yes = call1(Qyes_or_no_p, str);
2077 if (NILP (yes)) return 0; 2079 if (NILP (yes)) return 0;
2078 else return (1); 2080 else return (1);
2079 } 2081 }
2080 #endif
2081 } 2082 }
2082 2083
2083 static void 2084 static void
2084 puts2 (char *s) 2085 puts2 (char *s)
2085 { 2086 {