Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sc8-pr-cvs17:/tmp/cvs-serv17131/10.4/unstable/main/finkinfo/editors

Modified Files:
        yc.info yc.patch 
Log Message:
Handling for Fink canna 3.7p3-5 compatibility.

Index: yc.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/yc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- yc.patch    16 Dec 2006 23:30:15 -0000      1.3
+++ yc.patch    25 Sep 2007 16:23:04 -0000      1.4
@@ -1,3 +1,51 @@
+diff -Naur yc-4.0.13.orig/yc.el yc-4.0.13/yc.el
+--- yc-4.0.13.orig/yc.el       2007-09-22 14:18:56.000000000 +0900
++++ yc-4.0.13/yc.el    2007-09-25 14:43:24.000000000 +0900
+@@ -1708,10 +1708,20 @@
+ (defvar yc-rc-bushu-dic-list nil)
+ (defvar yc-rc-user-dic-list nil)
+ 
+-(defun yc-rc-load (files)
+-  (if (not (listp files)) (setq files (list files)))
+-  (let (romkana-table stay-after-validate n-henkan-for-ichiran)
+-    (while (car files)
++;; Fink canna 3.7p3-5 compatibility
++(defun yc-rc-load (files &optional noerror)
++  (if (listp files) ;; yc mode
++      (yc-load-internal files)
++    ;; canna compatible mode
++    (cond ((yc-load-internal (list files)) t)
++        (noerror nil)
++        (t (error "load: file not found")))))
++
++(defun yc-load-internal (files)
++  (let (romkana-table stay-after-validate n-henkan-for-ichiran
++      loaded-files
++      (canna-directory (get-yc-canna-lib-path)))
++    (while files
+       (when (and (file-exists-p (expand-file-name (car files)))
+                (file-readable-p (expand-file-name (car files))))
+       (setq yc-rc-dic-list nil
+@@ -1726,7 +1736,9 @@
+                                    (read-from-string buffer (cdr expr))
+                                  (error nil))))
+           (yc-eval-sexp (car expr)))))
++      (setq loaded-files (cons (car files) loaded-files))
+       (setq files (cdr files)))
++    (setq loaded-files (nreverse loaded-files))
+     (if romkana-table
+       (setq yc-rH-conv-dic (yc-search-file-first-in-path
+                             romkana-table (list "." (getenv "HOME")
+@@ -1736,7 +1748,8 @@
+     (setq yc-dic-list (or (reverse yc-rc-dic-list) yc-dic-list)
+         yc-bushu-dic-list (or yc-rc-bushu-dic-list yc-bushu-dic-list)
+         yc-user-dic-list (or yc-rc-user-dic-list yc-user-dic-list))
+-    (yc-var-unintern)))
++    (yc-var-unintern)
++    loaded-files))
+ 
+ (defun yc-eval-sexp (sexp)
+   (eval (print (yc-sexp-expand t sexp))))
 diff -Naur yc-4.0.13.orig/fink/yc-install yc-4.0.13/fink/yc-install
 --- yc-4.0.13.orig/fink/yc-install     1970-01-01 00:00:00.000000000 +0000
 +++ yc-4.0.13/fink/yc-install  2005-03-16 10:57:53.000000000 +0000

Index: yc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/yc.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- yc.info     16 Dec 2006 23:30:15 -0000      1.3
+++ yc.info     25 Sep 2007 16:23:04 -0000      1.4
@@ -1,6 +1,6 @@
 Package: yc
 Version: 4.0.13
-Revision: 5
+Revision: 6
 Description: Yet another Canna client for Emacsen
 License: GPL
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -10,7 +10,7 @@
 Source: http://www.ceres.dti.ne.jp/~knak/%n-%v.tar.gz
 Source-MD5: 5cc5f04346b806d4157b4b66d7eba69f
 PatchFile: %n.patch
-PatchFile-MD5: abc44a7580b5d580447ca5134a03de5e
+PatchFile-MD5: 01066bd6291a2de6880fa21ec01cfda1
 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 CompileScript: make icanna
 InstallScript: <<


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to