From: Stefan Monnier Date: Fri, 7 Sep 2007 03:48:30 +0000 (+0000) Subject: (compilation-get-file-structure): Complete last X-Git-Tag: emacs-pretest-22.1.90~847 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=34a9bf20b006e08b6321278ea9eb57b77b5dfec6;p=emacs.git (compilation-get-file-structure): Complete last change by also using spec-directory in the puthash. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f879c440765..7929aff5411 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-07 Stefan Monnier + + * progmodes/compile.el (compilation-get-file-structure): Complete last + change by also using spec-directory in the puthash. + 2007-09-07 Riccardo Murri * vc-bzr.el (vc-bzr-admin-lastrev): New constant. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 96ba3f80f3b..56385ca378d 100644 --- 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))))