diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:56:56 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:56:56 +0200 |
| commit | c516b49daa20beb1afddcfab874ffeb68189b5de (patch) | |
| tree | 0ab6ae2ec0dcc2155d200a70f11889ef48f4d7c4 /lisp/emacs-lisp | |
| parent | 4738aa1e12460ecf55ef08b72c585cbbafe51520 (diff) | |
| parent | 9db6817d638bf93a98de58612bac46e1ff425f26 (diff) | |
| download | emacs-c516b49daa20beb1afddcfab874ffeb68189b5de.tar.gz emacs-c516b49daa20beb1afddcfab874ffeb68189b5de.tar.bz2 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 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index c722c0b259c..9a635a47763 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3695,7 +3695,7 @@ Prepare every function for final compilation and drive the C back-end." (file-name-base output) "-") nil ".el"))) (with-temp-file temp-file - (insert ";; -*-coding: nil; -*-\n") + (insert ";; -*-coding: utf-8-emacs-unix; -*-\n") (mapc (lambda (e) (insert (prin1-to-string e))) expr)) |