]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 14 Jul 2022 09:56:56 +0000 (11:56 +0200)
committerStefan Kangas <stefan@marxist.se>
Thu, 14 Jul 2022 09:56:56 +0000 (11:56 +0200)
commitc516b49daa20beb1afddcfab874ffeb68189b5de
tree0ab6ae2ec0dcc2155d200a70f11889ef48f4d7c4
parent4738aa1e12460ecf55ef08b72c585cbbafe51520
parent9db6817d638bf93a98de58612bac46e1ff425f26
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
lisp/emacs-lisp/comp.el
test/src/comp-resources/comp-test-funcs.el
test/src/comp-tests.el