(compilation-get-file-structure): Complete last

change by also using spec-directory in the puthash.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f879c4407658dc1a14b4083e782111fa0b604a22..7929aff54117cb8f5b50e79fd84fabb3eac4c8bc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/compile.el (compilation-get-file-structure): Complete last
+       change by also using spec-directory in the puthash.
+
 2007-09-07  Riccardo Murri  <riccardo.murri@gmail.com>
 
        * vc-bzr.el (vc-bzr-admin-lastrev): New constant.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 96ba3f80f3b4a5d1ca5888a3e6894a6c9555a93b..56385ca378d407c9476172520322fd1f2d937df5 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1895,8 +1895,7 @@ FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME).
 In the former case, FILENAME may be relative or absolute.
 
 The file-structure looks like this:
-  (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)
-"
+  (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)"
   (or (gethash file compilation-locs)
       ;; File was not previously encountered, at least not in the form passed.
       ;; Let's normalize it and look again.
@@ -1940,9 +1939,7 @@ The file-structure looks like this:
                 ;; directories have the same name:
                 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00463.html
                 (or (gethash (cons filename spec-directory) compilation-locs)
-                    ;; TODO should this, without spec-directory, be
-                    ;; done at all?
-                    (puthash (list filename)
+                    (puthash (cons filename spec-directory)
                              (list (list filename spec-directory) fmt)
                              compilation-locs))
                 compilation-locs))))