diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-10-25 15:18:53 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-10-25 15:18:53 +0000 |
| commit | 8cd56959b43bd4e1ed5df42f2228b3302ea52812 (patch) | |
| tree | 1ba5aeb82de44910c2de10a775eeb3eab8c20963 /lisp/progmodes/flymake.el | |
| parent | 520b29e7aafc134741212a9161e9b3b7d6eca9cd (diff) | |
| download | emacs-8cd56959b43bd4e1ed5df42f2228b3302ea52812.tar.gz | |
* files.el (locate-dominating-stop-dir-regexp): New var.
(locate-dominating-file): Change arg from a regexp to a file name.
Rewrite using the vc-find-root code to avoid directory-files which is
too slow. Obey locate-dominating-stop-dir-regexp.
Don't pay attention to changes in owner.
(project-find-settings-file): Adjust call to locate-dominating-file.
* progmodes/flymake.el (flymake-find-buildfile):
Adjust call to locate-dominating-file.
* vc-hooks.el (vc-find-root): Use locate-dominating-file.
(vc-ignore-dir-regexp): Use locate-dominating-stop-dir-regexp.
Diffstat (limited to 'lisp/progmodes/flymake.el')
| -rw-r--r-- | lisp/progmodes/flymake.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 7f35e300994..b5856f3e115 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -340,13 +340,10 @@ Return nil if we cannot, non-nil if we can." Buildfile includes Makefile, build.xml etc. Return its file name if found, or nil if not found." (or (flymake-get-buildfile-from-cache source-dir-name) - (let* ((file (locate-dominating-file - source-dir-name - (concat "\\`" (regexp-quote buildfile-name) "\\'")))) + (let* ((file (locate-dominating-file source-dir-name buildfile-name))) (if file (progn (flymake-log 3 "found buildfile at %s" file) - (setq file (file-name-directory file)) (flymake-add-buildfile-to-cache source-dir-name file) file) (progn |