Commit 8ebbfc80 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(flymake-buildfile-dirs): Remove.

(flymake-find-buildfile): Use locate-dominating-file.
parent 6b6b9954
2007-07-20 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/flymake.el (flymake-buildfile-dirs): Remove.
(flymake-find-buildfile): Use locate-dominating-file.
* vc.el (vc-delistify): Use mapconcat.
(vc-do-command): Minor simplification.
(vc-expand-dirs): Use push.
......
......@@ -325,11 +325,6 @@ Return nil if we cannot, non-nil if we can."
(or (nth 2 (flymake-get-file-name-mode-and-masks file-name))
'flymake-get-real-file-name))
(defcustom flymake-buildfile-dirs '("." ".." "../.." "../../.." "../../../.." "../../../../.." "../../../../../.." "../../../../../../.." "../../../../../../../.." "../../../../../../../../.." "../../../../../../../../../.." "../../../../../../../../../../..")
"Dirs to look for buildfile."
:group 'flymake
:type '(repeat (string)))
(defvar flymake-find-buildfile-cache (flymake-makehash 'equal))
(defun flymake-get-buildfile-from-cache (dir-name)
......@@ -346,19 +341,15 @@ 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* ((dirs flymake-buildfile-dirs)
(buildfile-dir nil)
(found nil))
(while (and (not found) dirs)
(setq buildfile-dir (concat source-dir-name (car dirs)))
(when (file-exists-p (expand-file-name buildfile-name buildfile-dir))
(setq found t))
(setq dirs (cdr dirs)))
(if found
(let* ((file (locate-dominating-file
source-dir-name
(concat "\\`" (regexp-quote buildfile-name) "\\'"))))
(if file
(progn
(flymake-log 3 "found buildfile at %s/%s" buildfile-dir buildfile-name)
(flymake-add-buildfile-to-cache source-dir-name buildfile-dir)
buildfile-dir)
(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
(flymake-log 3 "buildfile for %s not found" source-dir-name)
nil)))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment