[Emacs-diffs] emacs/lisp ChangeLog cedet/ede/source.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/10/08 01:49:09

Modified files:
        lisp           : ChangeLog 
        lisp/cedet/ede : source.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16386&r2=1.16387
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/ede/source.el?cvsroot=emacs&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16386
retrieving revision 1.16387
diff -u -b -r1.16386 -r1.16387
--- ChangeLog   7 Oct 2009 17:10:19 -0000       1.16386
+++ ChangeLog   8 Oct 2009 01:49:05 -0000       1.16387
@@ -1,3 +1,9 @@
+2009-10-08  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (WINS_UPDATES): Fix typo in previous change.

Index: cedet/ede/source.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/ede/source.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/ede/source.el 2 Oct 2009 10:53:35 -0000       1.5
+++ cedet/ede/source.el 8 Oct 2009 01:49:09 -0000       1.6
@@ -106,19 +106,22 @@
   "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.