Mercurial > emacs

comparison lisp/progmodes/flymake.el @ 61674:b600a84e6555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(flymake-get-absolute-file-name-basedir): Remove. Update callers to use expand-file-name instead.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 19 Apr 2005 18:19:14 +0000
parents fb2f8ebf304e
children 26bd7a854809
comparison
equal deleted inserted replaced
61673:c0782a8eb3b4 61674:b600a84e6555
1763 (let* ((this-dir (nth (1- base-dirs-count) base-dirs)) 1763 (let* ((this-dir (nth (1- base-dirs-count) base-dirs))
1764 (this-file (nth 0 (nth (1- file-count) files))) 1764 (this-file (nth 0 (nth (1- file-count) files)))
1765 (this-real-name (nth 1 (nth (1- file-count) files)))) 1765 (this-real-name (nth 1 (nth (1- file-count) files))))
1766 ;;+(flymake-log 0 "this-dir=%s this-file=%s this-real=%s msg-file=%s" this-dir this-file this-real-name file-name-from-err-msg) 1766 ;;+(flymake-log 0 "this-dir=%s this-file=%s this-real=%s msg-file=%s" this-dir this-file this-real-name file-name-from-err-msg)
1767 (when (and this-dir this-file (flymake-same-files 1767 (when (and this-dir this-file (flymake-same-files
1768 (flymake-get-absolute-file-name-basedir file-name-from-err-msg this-dir) 1768 (expand-file-name file-name-from-err-msg this-dir)
1769 this-file)) 1769 this-file))
1770 (setq real-name this-real-name))) 1770 (setq real-name this-real-name)))
1771 (setq file-count (1- file-count))) 1771 (setq file-count (1- file-count)))
1772 (setq base-dirs-count (1- base-dirs-count))) 1772 (setq base-dirs-count (1- base-dirs-count)))
1773 real-name)) 1773 real-name))
1776 (let* ((real-name nil)) 1776 (let* ((real-name nil))
1777 (if (file-name-absolute-p file-name-from-err-msg) 1777 (if (file-name-absolute-p file-name-from-err-msg)
1778 (setq real-name file-name-from-err-msg) 1778 (setq real-name file-name-from-err-msg)
1779 (let* ((base-dirs-count (length base-dirs))) 1779 (let* ((base-dirs-count (length base-dirs)))
1780 (while (and (not real-name) (> base-dirs-count 0)) 1780 (while (and (not real-name) (> base-dirs-count 0))
1781 (let* ((full-name (flymake-get-absolute-file-name-basedir file-name-from-err-msg 1781 (let* ((full-name (expand-file-name file-name-from-err-msg
1782 (nth (1- base-dirs-count) base-dirs)))) 1782 (nth (1- base-dirs-count) base-dirs))))
1783 (if (file-exists-p full-name) 1783 (if (file-exists-p full-name)
1784 (setq real-name full-name)) 1784 (setq real-name full-name))
1785 (setq base-dirs-count (1- base-dirs-count)))))) 1785 (setq base-dirs-count (1- base-dirs-count))))))
1786 real-name)) 1786 real-name))
1787
1788 (defun flymake-get-absolute-file-name-basedir (file-name dir-name)
1789 (if (file-name-absolute-p file-name)
1790 file-name
1791 (concat dir-name "/" file-name)))
1792 1787
1793 (defun flymake-init-find-buildfile-dir (buffer source-file-name buildfile-name) 1788 (defun flymake-init-find-buildfile-dir (buffer source-file-name buildfile-name)
1794 "Find buildfile, store its dir in buffer data and return its dir, if found." 1789 "Find buildfile, store its dir in buffer data and return its dir, if found."
1795 (let* ((buildfile-dir (flymake-find-buildfile buildfile-name 1790 (let* ((buildfile-dir (flymake-find-buildfile buildfile-name
1796 (file-name-directory source-file-name) 1791 (file-name-directory source-file-name)