diff options
| author | Stefan Monnier | 2025-02-15 11:12:36 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2025-02-15 11:12:36 -0500 |
| commit | 7f2508e6e1176f16e9e6ac5b1aae43f07bb2cd8a (patch) | |
| tree | e8cc8a4ca7b16fdc8813ce5f2523d91fe20d641f /test | |
| parent | b8b7c6fbfdd62dd830a3a946db1746821e1aec3f (diff) | |
| download | emacs-7f2508e6e1176f16e9e6ac5b1aae43f07bb2cd8a.tar.gz emacs-7f2508e6e1176f16e9e6ac5b1aae43f07bb2cd8a.zip | |
(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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/vc/diff-mode-tests.el | 38 |
1 files changed, 19 insertions, 19 deletions
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")))) | |||
| 389 | 124 127 (face diff-context)))) | 389 | 124 127 (face diff-context)))) |
| 390 | 390 | ||
| 391 | ;; Test diff-font-lock-syntax. | 391 | ;; Test diff-font-lock-syntax. |
| 392 | (should (equal (mapcar (lambda (o) | 392 | (should (equal |
| 393 | (list (- (overlay-start o) diff-beg) | 393 | (delq nil |
| 394 | (- (overlay-end o) diff-beg) | 394 | (mapcar (lambda (o) |
| 395 | (append (and (overlay-get o 'diff-mode) | 395 | (when (overlay-get o 'face) |
| 396 | `(diff-mode ,(overlay-get o 'diff-mode))) | 396 | (list (- (overlay-start o) diff-beg) |
| 397 | (and (overlay-get o 'face) | 397 | (- (overlay-end o) diff-beg) |
| 398 | `(face ,(overlay-get o 'face)))))) | 398 | `( diff-mode ,(overlay-get o 'diff-mode) |
| 399 | face ,(overlay-get o 'face))))) | ||
| 399 | (sort (overlays-in (point-min) (point-max)) | 400 | (sort (overlays-in (point-min) (point-max)) |
| 400 | (lambda (a b) (< (overlay-start a) (overlay-start b))))) | 401 | (lambda (a b) |
| 401 | '((0 127 (diff-mode fine)) | 402 | (< (overlay-start a) (overlay-start b)))))) |
| 402 | (0 127 (diff-mode syntax)) | 403 | '((17 25 (diff-mode syntax face font-lock-preprocessor-face)) |
| 403 | (17 25 (diff-mode syntax face font-lock-preprocessor-face)) | 404 | (26 35 (diff-mode syntax face font-lock-string-face)) |
| 404 | (26 35 (diff-mode syntax face font-lock-string-face)) | 405 | (37 40 (diff-mode syntax face font-lock-type-face)) |
| 405 | (37 40 (diff-mode syntax face font-lock-type-face)) | 406 | (41 45 (diff-mode syntax face font-lock-function-name-face)) |
| 406 | (41 45 (diff-mode syntax face font-lock-function-name-face)) | 407 | (61 78 (diff-mode syntax face font-lock-string-face)) |
| 407 | (61 78 (diff-mode syntax face font-lock-string-face)) | 408 | (69 74 (diff-mode fine face diff-refine-removed)) |
| 408 | (69 74 (diff-mode fine face diff-refine-removed)) | 409 | (91 108 (diff-mode syntax face font-lock-string-face)) |
| 409 | (91 108 (diff-mode syntax face font-lock-string-face)) | 410 | (99 104 (diff-mode fine face diff-refine-added)) |
| 410 | (99 104 (diff-mode fine face diff-refine-added)) | 411 | (114 120 (diff-mode syntax face font-lock-keyword-face)))))))) |
| 411 | (114 120 (diff-mode syntax face font-lock-keyword-face)))))))) | ||
| 412 | 412 | ||
| 413 | (ert-deftest diff-mode-test-font-lock-syntax-one-line () | 413 | (ert-deftest diff-mode-test-font-lock-syntax-one-line () |
| 414 | "Check diff syntax highlighting for one line with no newline at end." | 414 | "Check diff syntax highlighting for one line with no newline at end." |