diff options
Diffstat (limited to 'lisp/progmodes/compile.el')
| -rw-r--r-- | lisp/progmodes/compile.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 0b9f417845f..a043bbcfa3c 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -316,8 +316,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 316 | (gcc-include | 316 | (gcc-include |
| 317 | "^\\(?:In file included \\| \\|\t\\)from \ | 317 | "^\\(?:In file included \\| \\|\t\\)from \ |
| 318 | \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\ | 318 | \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\ |
| 319 | \\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?\\(?:\\(:\\)\\|\\(,\\|$\\)\\)?" | 319 | \\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?\\(?:\\([:,]\\|$\\)\\)?" |
| 320 | 1 2 3 (4 . 5)) | 320 | 1 2 3 (nil . 4)) |
| 321 | 321 | ||
| 322 | (ruby-Test::Unit | 322 | (ruby-Test::Unit |
| 323 | "^ [[ ]?\\([^ (].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:in " 1 2) | 323 | "^ [[ ]?\\([^ (].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:in " 1 2) |
| @@ -2417,12 +2417,9 @@ and runs `compilation-filter-hook'." | |||
| 2417 | &optional object limit) | 2417 | &optional object limit) |
| 2418 | (let (parsed res) | 2418 | (let (parsed res) |
| 2419 | (while (progn | 2419 | (while (progn |
| 2420 | ;; We parse the buffer here "on-demand" by chunks of 500 chars. | ||
| 2421 | ;; But we could also just parse the whole buffer. | ||
| 2422 | (compilation--ensure-parse | 2420 | (compilation--ensure-parse |
| 2423 | (setq parsed (max compilation--parsed | 2421 | (setq parsed (max compilation--parsed |
| 2424 | (min (+ position 500) | 2422 | (or limit (point-max))))) |
| 2425 | (or limit (point-max)))))) | ||
| 2426 | (and (or (not (setq res (next-single-property-change | 2423 | (and (or (not (setq res (next-single-property-change |
| 2427 | position prop object limit))) | 2424 | position prop object limit))) |
| 2428 | (eq res limit)) | 2425 | (eq res limit)) |