From 391e8e530a6a271810f96ee7aa2d544b8c01d597 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 12 Jul 2019 21:57:18 +0300 Subject: [PATCH] * lisp/progmodes/compile.el (compilation-filter): `compilation--ensure-parse' is used instead of `font-lock-ensure' (bug#36564). * test/lisp/progmodes/compile-tests.el (compile-test-error-regexps) (compile-test-grep-regexps): Check the number of errors. --- lisp/progmodes/compile.el | 2 +- test/lisp/progmodes/compile-tests.el | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index a1df67fadfe..4b2fc516c3d 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2246,7 +2246,7 @@ and runs `compilation-filter-hook'." (comint-carriage-motion (process-mark proc) (point))) (set-marker (process-mark proc) (point)) ;; Update the number of errors in compilation-mode-line-errors - (font-lock-ensure compilation-filter-start (point)) + (compilation--ensure-parse (point)) ;; (set (make-local-variable 'compilation-buffer-modtime) ;; (current-time)) (run-hooks 'compilation-filter-hook)) diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index a7d1c6bc5e5..0d4f7f2ff28 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el @@ -401,7 +401,10 @@ can only work with the NUL byte to disambiguate colons.") The test data is in `compile-tests--test-regexps-data'." (with-temp-buffer (font-lock-mode -1) - (mapc #'compile--test-error-line compile-tests--test-regexps-data))) + (mapc #'compile--test-error-line compile-tests--test-regexps-data) + (should (eq compilation-num-errors-found 87)) + (should (eq compilation-num-warnings-found 32)) + (should (eq compilation-num-infos-found 20)))) (ert-deftest compile-test-grep-regexps () "Test the `grep-regexp-alist' regexps. @@ -421,6 +424,7 @@ The test data is in `compile-tests--grep-regexp-testcases'." (should (equal msg1 msg2)))) (dolist (testcase compile-tests--grep-regexp-tricky-testcases) (ert-info ((format "%S" testcase) :prefix "testcase: ") - (compile--test-error-line testcase))))) + (compile--test-error-line testcase))) + (should (eq compilation-num-errors-found 8)))) ;;; compile-tests.el ends here -- 2.39.2