* lisp/progmodes/compile.el (compilation-next-error-function):

Pass "formats" to compilation-find-file.

Fixes: debbugs:11777

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fb21997226e0737335ef7d861c9769a0ac0a090..9776dcd881292cedeabc7244ead37877c4ae956f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-24  Magnus Henoch  <magnus.henoch@gmail.com>
+
+       * progmodes/compile.el (compilation-next-error-function):
+       Pass "formats" to compilation-find-file (bug#11777).
+
 2013-04-24  Glenn Morris  <rgm@gnu.org>
 
        * vc/vc-bzr.el (vc-bzr-print-log):
@@ -22,12 +27,12 @@
 
 2013-04-23  Tassilo Horn  <tsdh@gnu.org>
 
-       * textmodes/reftex-vars.el (reftex-label-regexps): Call
-       `reftex-compile-variables' after changes to this variable.
+       * textmodes/reftex-vars.el (reftex-label-regexps):
+       Call `reftex-compile-variables' after changes to this variable.
 
 2013-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * jit-lock.el: Fix signals in jit-lock-force-redisplay.
+       * jit-lock.el: Fix signals in jit-lock-force-redisplay (bug#13542).
        Use lexical-binding.
        (jit-lock-force-redisplay): Use markers, check buffer's continued
        existence and beware narrowed buffers.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 98a89bb2363c9b1db84161be5110b35982c3a30c..d6f136ec92d534c89f1d1e6c11cf8af33d7c6fec 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2382,10 +2382,12 @@ This is the value of `next-error-function' in Compilation buffers."
                  ;;            (setq timestamp compilation-buffer-modtime)))
                  )
       (with-current-buffer
-          (compilation-find-file
-           marker
-           (caar (compilation--loc->file-struct loc))
-           (cadr (car (compilation--loc->file-struct loc))))
+          (apply #'compilation-find-file
+                 marker
+                 (caar (compilation--loc->file-struct loc))
+                 (cadr (car (compilation--loc->file-struct loc)))
+                 (compilation--file-struct->formats
+                  (compilation--loc->file-struct loc)))
         (let ((screen-columns
                ;; Obey the compilation-error-screen-columns of the target
                ;; buffer if its major mode set it buffer-locally.