diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-20 12:04:05 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-20 12:04:05 -0400 |
| commit | 790c2e44de7d6fcddceab31f1d18b1beb00267f3 (patch) | |
| tree | 45c3e52602d55dfcbf390692df92102ac44df011 | |
| parent | 808ecc4e18128c336d4fa9fa54409fdc00616370 (diff) | |
| download | emacs-790c2e44de7d6fcddceab31f1d18b1beb00267f3.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 17 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index adbe4f08827..6cf40c75d6c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 7e013b87c19..6bb31ca5cc4 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1950,13 +1950,16 @@ This is the value of `next-error-function' in Compilation buffers." ;; (`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 |