Synch with semi-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index eb3cf26..82c8ee5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * SEMI-CFG (PACKAGEDIR): Avoid an error with Emacs.
+
 2006-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * SEMI-MK (compile-semi-package): Use

diff --git a/SEMI-CFG b/SEMI-CFG
index 509b635..3dba230 100644 (file)
--- a/SEMI-CFG
+++ b/SEMI-CFG
@@ -173,7 +173,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))