diff options
| author | Stefan Kangas | 2022-07-14 11:56:56 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-07-14 11:56:56 +0200 |
| commit | c516b49daa20beb1afddcfab874ffeb68189b5de (patch) | |
| tree | 0ab6ae2ec0dcc2155d200a70f11889ef48f4d7c4 /test/src/comp-resources | |
| parent | 4738aa1e12460ecf55ef08b72c585cbbafe51520 (diff) | |
| parent | 9db6817d638bf93a98de58612bac46e1ff425f26 (diff) | |
| download | emacs-c516b49daa20beb1afddcfab874ffeb68189b5de.tar.gz emacs-c516b49daa20beb1afddcfab874ffeb68189b5de.zip | |
Merge from origin/emacs-28
9db6817d63 Remove uneffective test
7af88de410 Mark async worker tmp file as utf-8-emacs-unix (bug#48029)
# Conflicts:
# test/src/comp-resources/comp-test-45603.el
# test/src/comp-tests.el
Diffstat (limited to 'test/src/comp-resources')
| -rw-r--r-- | test/src/comp-resources/comp-test-funcs.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el index 0a60f4d6cc4..9092f040c80 100644 --- a/test/src/comp-resources/comp-test-funcs.el +++ b/test/src/comp-resources/comp-test-funcs.el | |||
| @@ -515,6 +515,8 @@ | |||
| 515 | (defun comp-test-47868-4-f () | 515 | (defun comp-test-47868-4-f () |
| 516 | #(" " 0 1 (face font-lock-keyword-face))) | 516 | #(" " 0 1 (face font-lock-keyword-face))) |
| 517 | 517 | ||
| 518 | (defun comp-test-48029-nonascii-žžž-f (arg) | ||
| 519 | (when arg t)) | ||
| 518 | 520 | ||
| 519 | 521 | ||
| 520 | ;;;;;;;;;;;;;;;;;;;; | 522 | ;;;;;;;;;;;;;;;;;;;; |