Mercurial > emacs
changeset 108323:bdf81babd7c5
Revert 2009-10-12 change to compilation-next-error-function (Bug#5983).
* progmodes/compile.el (compilation-next-error-function): Revert
2009-10-12 change (Bug#5983).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 20 Apr 2010 12:04:05 -0400 |
| parents | a70c2c59b3f6 |
| children | 297d4e80151f |
| files | lisp/ChangeLog lisp/progmodes/compile.el |
| diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Apr 20 11:57:54 2010 -0400 +++ b/lisp/ChangeLog Tue Apr 20 12:04:05 2010 -0400 @@ -1,3 +1,8 @@ +2010-04-20 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/compile.el (compilation-next-error-function): Revert + 2009-10-12 change (Bug#5983). + 2010-04-20 Dan Nicolaescu <dann@ics.uci.edu> * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
--- a/lisp/progmodes/compile.el Tue Apr 20 11:57:54 2010 -0400 +++ b/lisp/progmodes/compile.el Tue Apr 20 12:04:05 2010 -0400 @@ -1950,13 +1950,16 @@ ;; (`omake -P' polls filesystem for changes and recompiles when needed ;; in the same process and buffer). ;; So, recalculate all markers for that file. - (unless (and (nth 3 loc) (marker-buffer (nth 3 loc)) (nthcdr 4 loc) - ;; There may be no timestamp info if the loc is a `fake-loc', - ;; but we just checked that the file has been visited before! - (equal (nth 4 loc) - (setq timestamp - (with-current-buffer (marker-buffer (nth 3 loc)) - (visited-file-modtime))))) + (unless (and (nth 3 loc) (marker-buffer (nth 3 loc)) + ;; There may be no timestamp info if the loc is a `fake-loc'. + ;; So we skip the time-check here, although we should maybe + ;; change `compilation-fake-loc' to add timestamp info. + (or (null (nth 4 loc)) + (equal (nth 4 loc) + (setq timestamp + (with-current-buffer + (marker-buffer (nth 3 loc)) + (visited-file-modtime)))))) (with-current-buffer (compilation-find-file marker (caar (nth 2 loc)) (cadr (car (nth 2 loc)))) (save-restriction