diff options
| author | Eli Zaretskii | 2013-04-24 22:12:03 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-24 22:12:03 +0300 |
| commit | 2800c4d3155df0768410a675359fb360dfe2e791 (patch) | |
| tree | 26f88ac8793567324f8860b616fa5dc674945e22 /lisp/progmodes | |
| parent | 54ab7d34c56aca38b600cdc3e37fc215e7abec06 (diff) | |
| parent | 6139439fac7839d2c13ec9c1045b581d3941b2fc (diff) | |
| download | emacs-2800c4d3155df0768410a675359fb360dfe2e791.tar.gz emacs-2800c4d3155df0768410a675359fb360dfe2e791.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/compile.el | 10 |
1 files changed, 6 insertions, 4 deletions
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. |