X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fmule-wnnfns.c;h=dc71e641587311f05391cc77f7402cf6b083f749;hp=e258857d6a28633b8b917a65e8fbd5b92cf8cd92;hb=7b241b273a632ab80d7c620b5add28d5f11b0fd3;hpb=762383636a99307282c2d93d26c35c046ec24da1

diff --git a/src/mule-wnnfns.c b/src/mule-wnnfns.c
index e258857..dc71e64 100644
--- a/src/mule-wnnfns.c
+++ b/src/mule-wnnfns.c
@@ -271,7 +271,7 @@ Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 
 #include "wnn/commonhd.h"
-#include "mule-charset.h"
+#include "character.h"
 #include "wnn/jllib.h"
 #include "wnn/cplib.h"
 
@@ -321,14 +321,14 @@ Lisp_Object	Vwnn_server_type;
 Lisp_Object	Vcwnn_zhuyin;
 Lisp_Object	Vwnnenv_sticky;
 Lisp_Object	Vwnn_uniq_level;
-int		lb_sisheng;
+Fixnum		lb_sisheng;
 
 /* Lisp functions definition */
 
 DEFUN ("wnn-server-open", Fwnn_open, 2, 2, 0, /*
 Connect to jserver of host HNAME, make an environment with
 login name LNAME in the server.
-Return nil if error occurs
+Return nil if error occurs.
 */
      (hname, lname))
 {
@@ -528,7 +528,7 @@ Return information of dictionaries.
 
 DEFUN ("wnn-server-dict-comment", Fwnn_dict_comment, 2, 2, 0, /*
 Set comment to dictionary specified by DIC-NUMBER.
-Comment string COMMENT
+Comment string COMMENT.
 */
      (dicno, comment))
 {
@@ -771,7 +771,7 @@ Get bunsetsu information specified by BUN-NUMBER.
 
 
 DEFUN ("wnn-server-henkan-quit", Fwnn_quit_henkan, 0, 0, 0, /*
-do nothing
+do nothing.
 */
      ())
 {
@@ -862,7 +862,7 @@ Update frequency of bunsetsu specified by NUM-NUMBER.
 
 DEFUN ("wnn-server-word-add", Fwnn_word_toroku, 5, 5, 0, /*
 Add a word to dictionary. Arguments are
-DIC-NUMBER, KANJI, YOMI, COMMENT, HINSI-NUMBER
+DIC-NUMBER, KANJI, YOMI, COMMENT, HINSI-NUMBER.
 */
      (dicno, kanji, yomi, comment, hinsi))
 {
@@ -888,7 +888,7 @@ DIC-NUMBER, KANJI, YOMI, COMMENT, HINSI-NUMBER
 
 
 DEFUN ("wnn-server-word-delete", Fwnn_word_sakujo, 2, 2, 0, /*
-Delete a word from dictionary, specified by DIC-NUMBER, SERIAL-NUMBER
+Delete a word from dictionary, specified by DIC-NUMBER, SERIAL-NUMBER.
 */
      (no, serial))
 {
@@ -904,7 +904,7 @@ Delete a word from dictionary, specified by DIC-NUMBER, SERIAL-NUMBER
 
 
 DEFUN ("wnn-server-word-use", Fwnn_word_use, 2, 2, 0, /*
-Toggle on/off word, specified by DIC-NUMBER and SERIAL-NUMBER
+Toggle on/off word, specified by DIC-NUMBER and SERIAL-NUMBER.
 */
      (no, serial))
 {
@@ -955,7 +955,7 @@ Return list of yomi, kanji, comment, hindo, hinshi.
 
 DEFUN ("wnn-server-word-hindo-set", Fwnn_hindo_set, 3, 3, 0, /*
 Set frequency to arbitrary value. Specified by DIC-NUMBER,
-SERIAL-NUMBER, FREQUENCY
+SERIAL-NUMBER, FREQUENCY.
 */
      (no, serial, hindo))
 {
@@ -1066,7 +1066,6 @@ or wnn_kaikakko and the CDR contains the value.
 {
   int             rc;
   struct wnn_param	param;
-  Lisp_Object tail, key, val;
   int	snum;
 
   if ((snum = check_wnn_server_type ()) == -1) return Qnil;
@@ -1074,34 +1073,36 @@ or wnn_kaikakko and the CDR contains the value.
   rc = jl_param_get (wnnfns_buf[snum], &param);
   if (rc < 0) return Qnil;
 
-  EXTERNAL_PROPERTY_LIST_LOOP (tail, key, val, Vsetvalues_alist)
-    {
-      int setval;
-      CHECK_INT (val);
-      setval = XINT (val);
-      if (EQ (key, Qwnn_n)) param.n = setval;
-      else if (EQ (key, Qwnn_nsho)) param.nsho = setval;
-      else if (EQ (key, Qwnn_hindo)) param.p1 = setval;
-      else if (EQ (key, Qwnn_len)) param.p2 = setval;
-      else if (EQ (key, Qwnn_jiri)) param.p3 = setval;
-      else if (EQ (key, Qwnn_flag)) param.p4 = setval;
-      else if (EQ (key, Qwnn_jisho)) param.p5 = setval;
-      else if (EQ (key, Qwnn_sbn)) param.p6 = setval;
-      else if (EQ (key, Qwnn_dbn_len)) param.p7 = setval;
-      else if (EQ (key, Qwnn_sbn_cnt)) param.p8 = setval;
-      else if (EQ (key, Qwnn_suuji)) param.p9 = setval;
-      else if (EQ (key, Qwnn_kana)) param.p10 = setval;
-      else if (EQ (key, Qwnn_eisuu)) param.p11 = setval;
-      else if (EQ (key, Qwnn_kigou)) param.p12 = setval;
-      else if (EQ (key, Qwnn_toji_kakko)) param.p13 = setval;
-      else if (EQ (key, Qwnn_fuzokogo)) param.p14 = setval;
-      else if (EQ (key, Qwnn_kaikakko)) param.p15 = setval;
-      else
-        {
-	  signal_simple_error ("Invalid wnn keyword", key);
-	  return Qnil;
-	}
-    }
+  {
+    EXTERNAL_PROPERTY_LIST_LOOP_3 (key, val, Vsetvalues_alist)
+      {
+	int setval;
+	CHECK_INT (val);
+	setval = XINT (val);
+	if (EQ (key, Qwnn_n)) param.n = setval;
+	else if (EQ (key, Qwnn_nsho)) param.nsho = setval;
+	else if (EQ (key, Qwnn_hindo)) param.p1 = setval;
+	else if (EQ (key, Qwnn_len)) param.p2 = setval;
+	else if (EQ (key, Qwnn_jiri)) param.p3 = setval;
+	else if (EQ (key, Qwnn_flag)) param.p4 = setval;
+	else if (EQ (key, Qwnn_jisho)) param.p5 = setval;
+	else if (EQ (key, Qwnn_sbn)) param.p6 = setval;
+	else if (EQ (key, Qwnn_dbn_len)) param.p7 = setval;
+	else if (EQ (key, Qwnn_sbn_cnt)) param.p8 = setval;
+	else if (EQ (key, Qwnn_suuji)) param.p9 = setval;
+	else if (EQ (key, Qwnn_kana)) param.p10 = setval;
+	else if (EQ (key, Qwnn_eisuu)) param.p11 = setval;
+	else if (EQ (key, Qwnn_kigou)) param.p12 = setval;
+	else if (EQ (key, Qwnn_toji_kakko)) param.p13 = setval;
+	else if (EQ (key, Qwnn_fuzokogo)) param.p14 = setval;
+	else if (EQ (key, Qwnn_kaikakko)) param.p15 = setval;
+	else
+	  {
+	    signal_simple_error ("Invalid wnn keyword", key);
+	    return Qnil;
+	  }
+      }
+  }
 
 #if 0
   printf("wnn_n = %d\n",param.n);