]> git.eshelyaron.com Git - emacs.git/commitdiff
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)
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

1  2 
lisp/emacs-lisp/comp.el
test/src/comp-resources/comp-test-funcs.el
test/src/comp-tests.el

Simple merge
Simple merge