Mercurial > emacs
comparison lisp/progmodes/compile.el @ 91010:aaccdab0ee26
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-249
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Aug 2007 04:54:03 +0000 |
parents | 424b655804ca 77d2d5f85dbc |
children | bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
91009:e7395a700642 | 91010:aaccdab0ee26 |
---|---|
1970 (setq filename (command-line-normalize-file-name filename)) | 1970 (setq filename (command-line-normalize-file-name filename)) |
1971 | 1971 |
1972 ;; Store it for the possibly unnormalized name | 1972 ;; Store it for the possibly unnormalized name |
1973 (puthash file | 1973 (puthash file |
1974 ;; Retrieve or create file-structure for normalized name | 1974 ;; Retrieve or create file-structure for normalized name |
1975 (or (gethash (list filename) compilation-locs) | 1975 ;; The gethash used to not use spec-directory, but |
1976 ;; this leads to errors when files in different | |
1977 ;; directories have the same name: | |
1978 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00463.html | |
1979 (or (gethash (cons filename spec-directory) compilation-locs) | |
1980 ;; TODO should this, without spec-directory, be | |
1981 ;; done at all? | |
1976 (puthash (list filename) | 1982 (puthash (list filename) |
1977 (list (list filename spec-directory) fmt) | 1983 (list (list filename spec-directory) fmt) |
1978 compilation-locs)) | 1984 compilation-locs)) |
1979 compilation-locs)))) | 1985 compilation-locs)))) |
1980 | 1986 |