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

Synch with flim-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index e5a3ea2..ea6091f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* FLIM-CFG (PACKAGEDIR): Avoid an error with Emacs.
+
 2006-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* FLIM-MK (compile-flim-package): Use
diff --git a/FLIM-CFG b/FLIM-CFG
index b7040db..ad93717 100644
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -80,7 +80,8 @@
 			(listp configure-package-path))
 		   (delete "" configure-package-path))))
 	dir)
-    (while (not (file-exists-p (setq dir (car dirs))))
+    (while (and (setq dir (car dirs))
+		(not (file-exists-p dir)))
       (setq dirs (cdr dirs)))
     dir))