[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99768: Revert 2009-10-12 change to compilation-next-error-function (Bug#5983).

[Chong Yidong]

------------------------------------------------------------
revno: 99768
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-04-20 12:04:05 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-20 15:57:54 +0000
+++ b/lisp/ChangeLog    2010-04-20 16:04:05 +0000
@@ -1,3 +1,8 @@
+2010-04-20  Chong Yidong  <address@hidden>
+
+       * progmodes/compile.el (compilation-next-error-function): Revert
+       2009-10-12 change (Bug#5983).
+
 2010-04-20  Dan Nicolaescu  <address@hidden>
 
        * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-02-20 13:53:06 +0000
+++ b/lisp/progmodes/compile.el 2010-04-20 16:04:05 +0000
@@ -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