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
This commit is contained in:
Stefan Kangas 2022-07-14 11:56:56 +02:00
commit c516b49daa
3 changed files with 8 additions and 6 deletions

View file

@ -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))

View file

@ -515,6 +515,8 @@
(defun comp-test-47868-4-f ()
#(" " 0 1 (face font-lock-keyword-face)))
(defun comp-test-48029-nonascii-žžž-f (arg)
(when arg t))
;;;;;;;;;;;;;;;;;;;;

View file

@ -508,11 +508,6 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
(should (string= (comp-test-45635-f :height 180 :family "PragmataPro Liga")
"PragmataPro Liga")))
(comp-deftest 45603-1 ()
"<https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-12/msg01994.html>"
(load (native-compile (ert-resource-file "comp-test-45603.el")))
(should (fboundp 'comp-test-45603--file-local-name)))
(comp-deftest 46670-1 ()
"<https://lists.gnu.org/archive/html/bug-gnu-emacs/2021-02/msg01413.html>"
(should (string= (comp-test-46670-2-f "foo") "foo"))
@ -532,6 +527,11 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html."
(should (eq (comp-test-47868-1-f) (comp-test-47868-3-f)))
(should (eq (comp-test-47868-2-f) (comp-test-47868-4-f))))
(comp-deftest 48029-1 ()
"<https://lists.gnu.org/archive/html/bug-gnu-emacs/2022-07/msg00666.html>"
(should (subr-native-elisp-p
(symbol-function 'comp-test-48029-nonascii-žžž-f))))
;;;;;;;;;;;;;;;;;;;;;
;; Tromey's tests. ;;