Merge from origin/emacs-27

c00606171f (origin/emacs-27) A better fix for bug#43886
3196fd44c3 Avoid crashes when a theme is loaded with one frame suspended
0407b15500 Removed an incorrectly placed extra word in the semantic docs
040dcbe53e Fix current-line hscrolling when overlays change
c56eeba2ce Extend tests for shell-command-dont-erase-buffer

diff --cc src/term.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc test/lisp/net/tramp-tests.el
index 3914f9ae44eaa617cafc1b6c85ee01f22e97f8a0,fb4df639e5a82eac942c7b8127257fa9fd763266..c894f7ddaaa92bb690dc23bf38baca47ec099aa3
--- 1/test/lisp/net/tramp-tests.el
--- 2/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -4713,10 -4609,11 +4713,12 @@@ INPUT, if non-nil, is a string sent to 
  ;; This test is inspired by Bug#39067.
  (ert-deftest tramp-test32-shell-command-dont-erase-buffer ()
    "Check `shell-command-dont-erase-buffer'."
-   :tags '(:expensive-test)
+   ;; As long as Bug#40896 is not solved both in simple.el and Tramp,
+   ;; this test cannot run properly.
+   :tags '(:expensive-test :unstable)
    (skip-unless (tramp--test-enabled))
    (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
 +  (skip-unless (not (tramp--test-crypt-p)))
    ;; Prior Emacs 27, `shell-command-dont-erase-buffer' wasn't working properly.
    (skip-unless (tramp--test-emacs27-p))
  

diff --cc test/lisp/simple-tests.el
Simple merge