rpms/ddskk/devel ddskk-string-to-char-list-201524.patch, NONE, 1.1 ddskk.spec, 1.5, 1.6

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/ddskk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14364

Modified Files:
	ddskk.spec 
Added Files:
	ddskk-string-to-char-list-201524.patch 
Log Message:
- add ddskk-string-to-char-list-201524.patch to use string-to-list instead of
  string-to-char-list for XEmacs 21.5 (Ville Skytta, #201524)


ddskk-string-to-char-list-201524.patch:

--- NEW FILE ddskk-string-to-char-list-201524.patch ---
--- ddskk-12.2.0/skk.el~	2003-07-19 06:35:02.000000000 +0900
+++ ddskk-12.2.0/skk.el	2006-09-27 18:37:36.000000000 +0900
@@ -1079,7 +1079,7 @@
 	   (t
 	    ;; NEXT does not have any branch (i.e. NEXT is a leaf)
 	    (setq data (skk-get-kana next)
-		  queue (nconc (string-to-char-list
+		  queue (nconc (string-to-list
 				(skk-get-nextstate next))
 			       (cdr queue))
 		  skk-current-rule-tree nil))))
@@ -1090,7 +1090,7 @@
 	     (d
 	      ;; SKK-CURRENT-RULE-TREE have a roma->kana rule
 	      (setq data d
-		    queue (nconc (string-to-char-list
+		    queue (nconc (string-to-list
 				  (skk-get-nextstate
 				   skk-current-rule-tree))
 				 queue)
@@ -1102,7 +1102,7 @@
 		(cond
 		 (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))
 		 ((eq skk-current-rule-tree skk-rule-tree)
@@ -1197,7 +1197,7 @@
 (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
@@ -1216,7 +1216,7 @@
 (defun skk-delete-rule (tree string)
   "$BF~NO(B STRING $B$KBP$9$k%k!<%k$r%k!<%kLZ(B TREE $B$+$i:o=|$9$k!#(B"
   (catch 'return
-    (let ((char-list (string-to-char-list string))
+    (let ((char-list (string-to-list string))
 	  (cutpoint tree)
 	  ;; TREE $B$N:,$+$i=P$k;^$,(B1$BK\$7$+$J$$>l9g(B
 	  ;; $B$N$?$a$K0l1~=i4|2=$7$F$*$/(B
--- ddskk-12.2.0/tut-code/skk-mkmgk.el~	2002-12-22 05:57:59.000000000 +0900
+++ ddskk-12.2.0/tut-code/skk-mkmgk.el	2006-09-27 18:37:49.000000000 +0900
@@ -165,7 +165,7 @@
 	(if (null candidates0)
 	    nil
 	  ;; ¤Ò¤é¤¬¤Ê¸«½Ð¤·¤òʬ²ò
-	  (setq header-list (string-to-char-list header0))
+	  (setq header-list (string-to-list header0))
 	  (save-excursion ; have to restore point after searching
 	    (set-buffer reference)
 	    (let ((max (point-max)) (min (point-min))
--- ddskk-12.2.0/skk-isearch.el~	2002-12-22 05:57:54.000000000 +0900
+++ ddskk-12.2.0/skk-isearch.el	2006-09-27 18:37:18.000000000 +0900
@@ -447,7 +447,7 @@
   (if isearch-regexp
       (do ((prev (skk-isearch-last-char isearch-string) (car chars))
 	   (result "" (concat result (char-to-string (car chars))))
-	   (chars (string-to-char-list string) (cdr chars)))
+	   (chars (string-to-list string) (cdr chars)))
 	  ((null chars) result)
 	(when (and (skk-isearch-breakable-p prev)
 		   (skk-isearch-breakable-p (car chars)))


Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ddskk.spec	4 Aug 2006 03:52:13 -0000	1.5
+++ ddskk.spec	27 Sep 2006 09:40:44 -0000	1.6
@@ -1,12 +1,12 @@
 # [for Emacs] -*- coding: utf-8 -*-
 
-%define	apelminver	10.6
+%define	apelminver 10.6
 %define	pkgdir %{_datadir}/xemacs/mule-packages
 
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 12.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
@@ -18,7 +18,9 @@
 Requires: apel >= %{apelminver}
 Provides: skk
 Obsoletes: skk, ddskk-el
+# for xemacs-21.5
 Patch1: ddskk-12.2.0-xemacs-21.5-fixup-autoload.patch
+Patch2: ddskk-string-to-char-list-201524.patch
 
 %description
 Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program,
@@ -49,7 +51,8 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .xemacs-fixup
+%patch1 -p1 -b .1-xemacs-fixup
+%patch2 -p1 -b .2-charlist
 
 
 %build
@@ -106,7 +109,11 @@
 
 
 %changelog
-* Fri Aug  4 2006 Jens Petersen <petersen at redhat.com> - 12.2.0-8.fc6
+* Wed Sep 27 2006 Jens Petersen <petersen at redhat.com> - 12.2.0-9
+- add ddskk-string-to-char-list-201524.patch to use string-to-list instead of
+  string-to-char-list for XEmacs 21.5 (Ville Skytta, #201524)
+
+* Fri Aug  4 2006 Jens Petersen <petersen at redhat.com> - 12.2.0-8
 - add ddskk-12.2.0-xemacs-21.5-fixup-autoload.patch for autoload generation
   in xemacs 21.5