Commits

Anonymous committed 08ba7b8

2002-04-28 Steve Youngs <youngs@xemacs.org>

* skk.el (skk-kana-input): Use 'string-to-list' instead of
'string-to-char-list'.
(skk-add-rule): Ditto.
(skk-delete-rule): Ditto.

* skk-isearch.el (skk-isearch-search-string-regexp): Ditto.

* skk-foreword.el (skk-str-length): Ditto.
(skk-substring): Ditto.
(skk-str-ref): Ditto.

  • Participants
  • Parent commits c8e7964

Comments (0)

Files changed (4)

+2002-04-28  Steve Youngs  <youngs@xemacs.org>
+
+	* skk.el (skk-kana-input): Use 'string-to-list' instead of
+	'string-to-char-list'. 
+	(skk-add-rule): Ditto.
+	(skk-delete-rule): Ditto.
+
+	* skk-isearch.el (skk-isearch-search-string-regexp): Ditto.
+
+	* skk-foreword.el (skk-str-length): Ditto.
+	(skk-substring): Ditto.
+	(skk-str-ref): Ditto.
+
 2002-01-26  Steve Youngs  <youngs@xemacs.org>
 
 	* Makefile (GENERATED): Add missing custom-load.elc

File skk-foreword.el

    ((eq skk-emacs-type 'mule3)
     (length (string-to-vector str)) )
    ((eq skk-emacs-type 'mule2)
-    (length (string-to-char-list str)) )))
+    (length (string-to-list str)) )))
 
 (defsubst skk-substring (str pos1 pos2)
   (static-cond
 	(setq pos2 (+ (skk-str-length str) pos2)) )
     (if (>= pos1 pos2)
 	""
-      (let ((sl (nthcdr pos1 (string-to-char-list str))))
+      (let ((sl (nthcdr pos1 (string-to-list str))))
 	(setcdr (nthcdr (- pos2 pos1 1) sl) nil)
 	(concat sl) )))
    ((eq skk-emacs-type 'mule2)
 	(setq pos2 (+ (skk-str-length str) pos2)) )
     (if (>= pos1 pos2)
 	""
-      (let ((sl (nthcdr pos1 (string-to-char-list str))))
+      (let ((sl (nthcdr pos1 (string-to-list str))))
 	(setcdr (nthcdr (- pos2 pos1 1) sl) nil)
 	(mapconcat 'char-to-string sl "") )))))
 
    ((eq skk-emacs-type 'mule3)
     (aref (string-to-vector str) pos ) )
    ((eq skk-emacs-type 'mule2)
-    (nth pos (string-to-char-list str)) )))
+    (nth pos (string-to-list str)) )))
 
 (defsubst skk-jisx0208-p (char)
   (static-cond

File skk-isearch.el

 
 (defun skk-isearch-search-string-regexp (string)
   (if isearch-regexp
-      (let ((chars (string-to-char-list string))
+      (let ((chars (string-to-list string))
 	    (prev (skk-isearch-last-char isearch-string))
 	    (result ""))
 	(while chars
 			skk-current-rule-tree next))
 	      ;; NEXT does not have any branch (i.e. NEXT is a leaf)
 	      (setq data (skk-get-kana next)
-		    queue (nconc (string-to-char-list (skk-get-nextstate next))
+		    queue (nconc (string-to-list (skk-get-nextstate next))
 				 (cdr queue))
 		    skk-current-rule-tree nil))
 	  ;; can not go down SKK-CURRENT-RULE-TREE
 		;; SKK-CURRENT-RULE-TREE have a roma->kana rule
 		(setq data d
 		      queue
-		      (nconc (string-to-char-list
+		      (nconc (string-to-list
 			      (skk-get-nextstate skk-current-rule-tree))
 			     queue)
 		      skk-current-rule-tree nil)
 			     (funcall skk-kana-input-search-function))))
 		(if dd
 		    (setq data (car dd)
-			  queue (nconc (string-to-char-list (cdr dd))
+			  queue (nconc (string-to-list (cdr dd))
 				       (cdr queue))
 			  skk-current-rule-tree nil)
 		  (if (eq skk-current-rule-tree skk-rule-tree)
 (defun skk-add-rule (tree rule)
   (let* ((prefix (nth 0 rule))
 	 (l (length prefix))
-	 (result (skk-search-tree tree (string-to-char-list prefix)))
+	 (result (skk-search-tree tree (string-to-list prefix)))
 	 (rest (car result))
 	 (addpoint (cdr result)))
     (while rest
 (defun skk-delete-rule (tree string)
   ;; $BF~NO(B STRING $B$KBP$9$k%k!<%k$r%k!<%kLZ(B TREE $B$+$i:o=|(B
   (catch 'return
-    (let ((char-list (string-to-char-list string))
+    (let ((char-list (string-to-list string))
 	  (cutpoint tree)
 	  (cuttree (car (skk-get-branch-list tree)))
 					; TREE $B$N:,$+$i=P$k;^$,(B1$BK\$7$+$J$$>l9g(B