From: yamaoka <yamaoka>
Date: Wed, 20 Dec 2006 23:13:45 +0000 (+0000)
Subject: Synch with flim-1_14 branch.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cddf5203ba429ffe741e0178658c18a5dfe23b5e;p=elisp%2Fflim.git

Synch with flim-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index ea6091f..d476c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* README.ja, README.en (Installation): Update required version of
+	APEL to 10.7 or later.
+
+	* FLIM-CFG (PACKAGEDIR): Use
+	`install-get-default-package-directory'.
+
 2006-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* FLIM-CFG (PACKAGEDIR): Avoid an error with Emacs.
diff --git a/FLIM-CFG b/FLIM-CFG
index ad93717..3878aca 100644
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -61,28 +61,6 @@
       (expand-file-name FLIM_PREFIX VERSION_SPECIFIC_LISPDIR))
 
 (defvar PACKAGEDIR
-  (let ((dirs (append
-	       (cond ((boundp 'early-package-hierarchies)
-		      (append (if early-package-load-path
-				  early-package-hierarchies)
-			      (if late-package-load-path
-				  late-package-hierarchies)
-			      (if last-package-load-path
-				  last-package-hierarchies)))
-		     ((boundp 'early-packages)
-		      (append (if early-package-load-path
-				  early-packages)
-			      (if late-package-load-path
-				  late-packages)
-			      (if last-package-load-path
-				  last-packages))))
-	       (if (and (boundp 'configure-package-path)
-			(listp configure-package-path))
-		   (delete "" configure-package-path))))
-	dir)
-    (while (and (setq dir (car dirs))
-		(not (file-exists-p dir)))
-      (setq dirs (cdr dirs)))
-    dir))
+  (install-get-default-package-directory))
 
 ;;; FLIM-CFG ends here
diff --git a/README.en b/README.en
index da9875d..c3c0d3f 100644
--- a/README.en
+++ b/README.en
@@ -44,7 +44,7 @@ What's FLIM
 Installation
 ============
 
-(0) before installing it, please install APEL (9.22 or later) package.
+(0) before installing it, please install APEL (10.7 or later) package.
     APEL package is available at:
 
 	ftp://ftp.m17n.org/pub/mule/apel/
diff --git a/README.ja b/README.ja
index b9592ba..619a3e0 100644
--- a/README.ja
+++ b/README.ja
@@ -39,10 +39,10 @@ FLIM とは？
 	XEmacs 21.1 以降
 
 
-導入 (install)
-==============
+導入 (Installation)
+===================
 
-(0) 導入 (install) する前に、APEL (9.22 以降) を導入してください。APEL 
+(0) 導入 (install) する前に、APEL (10.7 以降) を導入してください。APEL
     は以下のところで取得できます:
 
 	ftp://ftp.m17n.org/pub/mule/apel/