(flymake-get-absolute-file-name-basedir): Remove. Update callers to use

expand-file-name instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ab4055dedd3411f7de63fcdd0197e763cd094e7..11698bc9e8c27972638ddb6736a5c76110a2f887 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/flymake.el (flymake-get-absolute-file-name-basedir):
+       Remove.  Update callers to use expand-file-name instead.
+
        * subr.el (syntax-class): New function.
 
        * simple.el (blink-matching-open): Use it.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 7067ddca21ca55b894ad56b053caa36633e442fe..73d77affdc498f21044588ca69d8b8f5acde2212 100644 (file)
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1765,7 +1765,7 @@ Return full-name.  Names are real, not patched."
               (this-real-name  (nth 1 (nth (1- file-count) files))))
          ;;+(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)
          (when (and this-dir this-file (flymake-same-files
-                                        (flymake-get-absolute-file-name-basedir file-name-from-err-msg this-dir)
+                                        (expand-file-name file-name-from-err-msg this-dir)
                                         this-file))
            (setq real-name this-real-name)))
        (setq file-count (1- file-count)))
@@ -1778,18 +1778,13 @@ Return full-name.  Names are real, not patched."
        (setq real-name file-name-from-err-msg)
       (let* ((base-dirs-count  (length base-dirs)))
        (while (and (not real-name) (> base-dirs-count 0))
-         (let* ((full-name (flymake-get-absolute-file-name-basedir file-name-from-err-msg
-                                                                   (nth (1- base-dirs-count) base-dirs))))
+         (let* ((full-name (expand-file-name file-name-from-err-msg
+                                             (nth (1- base-dirs-count) base-dirs))))
            (if (file-exists-p full-name)
                (setq real-name full-name))
            (setq base-dirs-count (1- base-dirs-count))))))
     real-name))
 
-(defun flymake-get-absolute-file-name-basedir (file-name dir-name)
-  (if (file-name-absolute-p file-name)
-      file-name
-    (concat dir-name "/" file-name)))
-
 (defun flymake-init-find-buildfile-dir (buffer source-file-name buildfile-name)
   "Find buildfile, store its dir in buffer data and return its dir, if found."
   (let* ((buildfile-dir  (flymake-find-buildfile buildfile-name