diff options
| author | Magnus Henoch | 2013-04-24 09:50:22 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-04-24 09:50:22 -0400 |
| commit | 4391916c58d5d2fb09b7a505161f37401f2542d2 (patch) | |
| tree | 001109a7357fd14e60347d8451dffa0837e71ef9 /lisp | |
| parent | 3b8fe7527bba99adb7901bce07b7b124c3ce9726 (diff) | |
| download | emacs-4391916c58d5d2fb09b7a505161f37401f2542d2.tar.gz emacs-4391916c58d5d2fb09b7a505161f37401f2542d2.zip | |
* lisp/progmodes/compile.el (compilation-next-error-function):
Pass "formats" to compilation-find-file.
Fixes: debbugs:11777
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0fb21997226..9776dcd8812 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-24 Magnus Henoch <magnus.henoch@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-next-error-function): | ||
| 4 | Pass "formats" to compilation-find-file (bug#11777). | ||
| 5 | |||
| 1 | 2013-04-24 Glenn Morris <rgm@gnu.org> | 6 | 2013-04-24 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * vc/vc-bzr.el (vc-bzr-print-log): | 8 | * vc/vc-bzr.el (vc-bzr-print-log): |
| @@ -22,12 +27,12 @@ | |||
| 22 | 27 | ||
| 23 | 2013-04-23 Tassilo Horn <tsdh@gnu.org> | 28 | 2013-04-23 Tassilo Horn <tsdh@gnu.org> |
| 24 | 29 | ||
| 25 | * textmodes/reftex-vars.el (reftex-label-regexps): Call | 30 | * textmodes/reftex-vars.el (reftex-label-regexps): |
| 26 | `reftex-compile-variables' after changes to this variable. | 31 | Call `reftex-compile-variables' after changes to this variable. |
| 27 | 32 | ||
| 28 | 2013-04-23 Stefan Monnier <monnier@iro.umontreal.ca> | 33 | 2013-04-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 29 | 34 | ||
| 30 | * jit-lock.el: Fix signals in jit-lock-force-redisplay. | 35 | * jit-lock.el: Fix signals in jit-lock-force-redisplay (bug#13542). |
| 31 | Use lexical-binding. | 36 | Use lexical-binding. |
| 32 | (jit-lock-force-redisplay): Use markers, check buffer's continued | 37 | (jit-lock-force-redisplay): Use markers, check buffer's continued |
| 33 | existence and beware narrowed buffers. | 38 | existence and beware narrowed buffers. |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 98a89bb2363..d6f136ec92d 100644 --- 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." | |||
| 2382 | ;; (setq timestamp compilation-buffer-modtime))) | 2382 | ;; (setq timestamp compilation-buffer-modtime))) |
| 2383 | ) | 2383 | ) |
| 2384 | (with-current-buffer | 2384 | (with-current-buffer |
| 2385 | (compilation-find-file | 2385 | (apply #'compilation-find-file |
| 2386 | marker | 2386 | marker |
| 2387 | (caar (compilation--loc->file-struct loc)) | 2387 | (caar (compilation--loc->file-struct loc)) |
| 2388 | (cadr (car (compilation--loc->file-struct loc)))) | 2388 | (cadr (car (compilation--loc->file-struct loc))) |
| 2389 | (compilation--file-struct->formats | ||
| 2390 | (compilation--loc->file-struct loc))) | ||
| 2389 | (let ((screen-columns | 2391 | (let ((screen-columns |
| 2390 | ;; Obey the compilation-error-screen-columns of the target | 2392 | ;; Obey the compilation-error-screen-columns of the target |
| 2391 | ;; buffer if its major mode set it buffer-locally. | 2393 | ;; buffer if its major mode set it buffer-locally. |