From: Glenn Morris <rgm@gnu.org>
Date: Sat, 10 Oct 2020 14:50:20 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~5696
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ed0dac0ca501a9f328c332a7993bf0624c3873c;p=emacs.git

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

0ed0dac0ca501a9f328c332a7993bf0624c3873c
diff --cc test/lisp/net/tramp-tests.el
index 3914f9ae44e,fb4df639e5a..c894f7ddaaa
--- a/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))