2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a337f8f5a8c..f6a1c77b1a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't
+        destroy list before using it.
+
 2010-04-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Fix the version number for added files.
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 971cd70a6ee..19c4b26edcd 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -425,10 +425,9 @@ sources variable."
         (link (ede-proj-linkers this))
         (name (ede-proj-makefile-target-name this))
         (src (oref this source)))
-    (while comp
-      (ede-compiler-only-once (car comp)
-        (ede-proj-makefile-insert-variables (car comp)))
-      (setq comp (cdr comp)))
+    (dolist (obj comp)
+      (ede-compiler-only-once obj
+                              (ede-proj-makefile-insert-variables obj)))
     (ede-proj-makefile-insert-object-variables (car comp) name src)
     (while link
       (ede-linker-only-once (car link)