From: Stefan Monnier Date: Sat, 15 Feb 2025 16:12:36 +0000 (-0500) Subject: (diff-mode-test-font-lock): Fix spurious test failure X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc8564a9f0307bdedd71d9fdf23555bda5544d0b;p=emacs.git (diff-mode-test-font-lock): Fix spurious test failure * test/lisp/vc/diff-mode-tests.el (diff-mode-test-font-lock): Don't nitpick about non-face-affecting overlays. (cherry picked from commit 7f2508e6e1176f16e9e6ac5b1aae43f07bb2cd8a) --- diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el index 06309160e52..cd3f613f532 100644 --- a/test/lisp/vc/diff-mode-tests.el +++ b/test/lisp/vc/diff-mode-tests.el @@ -389,26 +389,26 @@ baz")))) 124 127 (face diff-context)))) ;; Test diff-font-lock-syntax. - (should (equal (mapcar (lambda (o) - (list (- (overlay-start o) diff-beg) - (- (overlay-end o) diff-beg) - (append (and (overlay-get o 'diff-mode) - `(diff-mode ,(overlay-get o 'diff-mode))) - (and (overlay-get o 'face) - `(face ,(overlay-get o 'face)))))) + (should (equal + (delq nil + (mapcar (lambda (o) + (when (overlay-get o 'face) + (list (- (overlay-start o) diff-beg) + (- (overlay-end o) diff-beg) + `( diff-mode ,(overlay-get o 'diff-mode) + face ,(overlay-get o 'face))))) (sort (overlays-in (point-min) (point-max)) - (lambda (a b) (< (overlay-start a) (overlay-start b))))) - '((0 127 (diff-mode fine)) - (0 127 (diff-mode syntax)) - (17 25 (diff-mode syntax face font-lock-preprocessor-face)) - (26 35 (diff-mode syntax face font-lock-string-face)) - (37 40 (diff-mode syntax face font-lock-type-face)) - (41 45 (diff-mode syntax face font-lock-function-name-face)) - (61 78 (diff-mode syntax face font-lock-string-face)) - (69 74 (diff-mode fine face diff-refine-removed)) - (91 108 (diff-mode syntax face font-lock-string-face)) - (99 104 (diff-mode fine face diff-refine-added)) - (114 120 (diff-mode syntax face font-lock-keyword-face)))))))) + (lambda (a b) + (< (overlay-start a) (overlay-start b)))))) + '((17 25 (diff-mode syntax face font-lock-preprocessor-face)) + (26 35 (diff-mode syntax face font-lock-string-face)) + (37 40 (diff-mode syntax face font-lock-type-face)) + (41 45 (diff-mode syntax face font-lock-function-name-face)) + (61 78 (diff-mode syntax face font-lock-string-face)) + (69 74 (diff-mode fine face diff-refine-removed)) + (91 108 (diff-mode syntax face font-lock-string-face)) + (99 104 (diff-mode fine face diff-refine-added)) + (114 120 (diff-mode syntax face font-lock-keyword-face)))))))) (ert-deftest diff-mode-test-font-lock-syntax-one-line () "Check diff syntax highlighting for one line with no newline at end."