[Emacs-diffs] /srv/bzr/emacs/trunk r105514: Fix error in compilation-error-properties.

[Chong Yidong]

------------------------------------------------------------
revno: 105514
fixes bug(s): http://debbugs.gnu.org/9319
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-20 22:07:00 -0400
message:
  Fix error in compilation-error-properties.
  
  * lisp/progmodes/compile.el (compilation-error-properties): Fix
  confusion between file struct and message struct (Bug#9319).
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-21 01:01:12 +0000
+++ b/lisp/ChangeLog    2011-08-21 02:07:00 +0000
@@ -1,5 +1,8 @@
 2011-08-21  Chong Yidong  <address@hidden>
 
+       * progmodes/compile.el (compilation-error-properties): Fix
+       confusion between file struct and message struct (Bug#9319).
+
        * net/browse-url.el (browse-url-firefox): Don't call
        browse-url-firefox-sentinel unless using -remote (Bug#9328).
 

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-08-18 11:36:19 +0000
+++ b/lisp/progmodes/compile.el 2011-08-21 02:07:00 +0000
@@ -985,12 +985,15 @@
            (let* ((prev
                    (or (get-text-property (1- prev-pos) 'compilation-message)
                        (get-text-property prev-pos 'compilation-message)))
-                  (prev-struct
-                   (car (nth 2 (car prev)))))
+                  (prev-file-struct
+                   (and prev
+                        (compilation--loc->file-struct
+                         (compilation--message->loc prev)))))
+
              ;; Construct FILE . DIR from that.
-             (if prev-struct
-                 (setq file (cons (car prev-struct)
-                                  (cadr prev-struct))))))
+             (if prev-file-struct
+                 (setq file (cons (caar prev-file-struct)
+                                  (cadr (car prev-file-struct)))))))
        (unless file
          (setq file '("*unknown*")))))
     ;; All of these fields are optional, get them only if we have an index, and