diff options
| author | Chong Yidong | 2009-10-08 01:49:05 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-10-08 01:49:05 +0000 |
| commit | c2a81032c88bba4a4cbdee878e525407b2625ebe (patch) | |
| tree | 978a944e838e62277c840fa784499009e588eb91 | |
| parent | a3b841018edf67aebec89346402a6e6ee2ccc247 (diff) | |
| download | emacs-c2a81032c88bba4a4cbdee878e525407b2625ebe.tar.gz emacs-c2a81032c88bba4a4cbdee878e525407b2625ebe.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cedet/ede/source.el | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6e61b3c95d..d5dbdaf890d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-10-08 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * cedet/ede/source.el (ede-want-any-source-files-p) | ||
| 4 | (ede-want-any-auxiliary-files-p, ede-want-any-files-p): Return | ||
| 5 | search result. This error was introduced while merging. | ||
| 6 | |||
| 1 | 2009-10-07 Juanma Barranquero <lekktu@gmail.com> | 7 | 2009-10-07 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * makefile.w32-in (WINS_UPDATES): Fix typo in previous change. | 9 | * 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.") | |||
| 106 | "Return non-nil if THIS will accept any source files in FILENAMES." | 106 | "Return non-nil if THIS will accept any source files in FILENAMES." |
| 107 | (let (found) | 107 | (let (found) |
| 108 | (while (and (not found) filenames) | 108 | (while (and (not found) filenames) |
| 109 | (setq found (ede-want-file-source-p this (pop filenames)))))) | 109 | (setq found (ede-want-file-source-p this (pop filenames)))) |
| 110 | found)) | ||
| 110 | 111 | ||
| 111 | (defmethod ede-want-any-auxiliary-files-p ((this ede-sourcecode) filenames) | 112 | (defmethod ede-want-any-auxiliary-files-p ((this ede-sourcecode) filenames) |
| 112 | "Return non-nil if THIS will accept any aux files in FILENAMES." | 113 | "Return non-nil if THIS will accept any aux files in FILENAMES." |
| 113 | (let (found) | 114 | (let (found) |
| 114 | (while (and (not found) filenames) | 115 | (while (and (not found) filenames) |
| 115 | (setq found (ede-want-file-auxiliary-p this (pop filenames)))))) | 116 | (setq found (ede-want-file-auxiliary-p this (pop filenames)))) |
| 117 | found)) | ||
| 116 | 118 | ||
| 117 | (defmethod ede-want-any-files-p ((this ede-sourcecode) filenames) | 119 | (defmethod ede-want-any-files-p ((this ede-sourcecode) filenames) |
| 118 | "Return non-nil if THIS will accept any files in FILENAMES." | 120 | "Return non-nil if THIS will accept any files in FILENAMES." |
| 119 | (let (found) | 121 | (let (found) |
| 120 | (while (and (not found) filenames) | 122 | (while (and (not found) filenames) |
| 121 | (setq found (ede-want-file-p this (pop filenames)))))) | 123 | (setq found (ede-want-file-p this (pop filenames)))) |
| 124 | found)) | ||
| 122 | 125 | ||
| 123 | (defmethod ede-buffer-header-file ((this ede-sourcecode) filename) | 126 | (defmethod ede-buffer-header-file ((this ede-sourcecode) filename) |
| 124 | "Return a list of file names of header files for THIS with FILENAME. | 127 | "Return a list of file names of header files for THIS with FILENAME. |