From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 8 Oct 2009 01:49:05 +0000 (+0000)
Subject: * cedet/ede/source.el (ede-want-any-source-files-p)
X-Git-Tag: emacs-pretest-23.1.90~878
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2a81032c88bba4a4cbdee878e525407b2625ebe;p=emacs.git

* cedet/ede/source.el (ede-want-any-source-files-p)
(ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return
search result.  This error was introduced while merging.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6e61b3c95d..d5dbdaf890d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* cedet/ede/source.el (ede-want-any-source-files-p)
+	(ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return
+	search result.  This error was introduced while merging.
+
 2009-10-07  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in (WINS_UPDATES): Fix typo in previous change.
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index 3864df1e12a..097fc064b9f 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -106,19 +106,22 @@ that they are willing to use.")
   "Return non-nil if THIS will accept any source files in FILENAMES."
   (let (found)
     (while (and (not found) filenames)
-      (setq found (ede-want-file-source-p this (pop filenames))))))
+      (setq found (ede-want-file-source-p this (pop filenames))))
+    found))
 
 (defmethod ede-want-any-auxiliary-files-p ((this ede-sourcecode) filenames)
   "Return non-nil if THIS will accept any aux files in FILENAMES."
   (let (found)
     (while (and (not found) filenames)
-      (setq found (ede-want-file-auxiliary-p this (pop filenames))))))
+      (setq found (ede-want-file-auxiliary-p this (pop filenames))))
+    found))
 
 (defmethod ede-want-any-files-p ((this ede-sourcecode) filenames)
   "Return non-nil if THIS will accept any files in FILENAMES."
   (let (found)
     (while (and (not found) filenames)
-      (setq found (ede-want-file-p this (pop filenames))))))
+      (setq found (ede-want-file-p this (pop filenames))))
+    found))
 
 (defmethod ede-buffer-header-file ((this ede-sourcecode) filename)
   "Return a list of file names of header files for THIS with FILENAME.