Merge from origin/emacs-28

84a2857722 Fix scrolling of the stack window in Calc
9dd44505b1 ; * src/window.c (Fset_window_start): Clarify the effect o...
24a6c7c8c0 Update and fix instructions and scripts for updating the W...
886339747b Extend tramp-archive-test45-auto-load
ff997ad786 Ensure local `default-directory' in Tramp when needed
4f27588a16 Clarify "idleness" in the ELisp manual

diff --cc admin/admin.el
Simple merge

diff --cc doc/lispref/os.texi
Simple merge

diff --cc lisp/calc/calc.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc src/window.c
Simple merge

diff --cc test/lisp/net/tramp-archive-tests.el
index 254595d1b4fdd8e98f3e1196f8023ad641159a40,aaa41d0c584ed1eb38dcb0229fdf39a731b3c1df..fe27629d902a759801852cdb10f839d653a4204d
--- 1/test/lisp/net/tramp-archive-tests.el
--- 2/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@@ -905,30 -926,33 +905,33 @@@ This tests also `file-executable-p', `f
                (file-attributes %S \"/\")) \
            (message \"tramp-archive loaded: %%s\" \
                (featurep 'tramp-archive))))"))
-     (dolist (default-directory
-               `(,temporary-file-directory
-               ;;  Starting Emacs in a directory which has
-               ;; `tramp-archive-file-name-regexp' syntax is
-               ;; supported only with Emacs > 27.2 (sigh!).
-               ;; (Bug#48476)
-                 ,(file-name-as-directory tramp-archive-test-directory)))
-       (dolist (file `("/mock::foo" ,(concat tramp-archive-test-archive "foo")))
-         (should
-          (string-match
-         (format
-          "tramp-archive loaded: %s[[:ascii:]]+tramp-archive loaded: %s"
-          (tramp-archive-file-name-p default-directory)
-          (or (tramp-archive-file-name-p default-directory)
-                (tramp-archive-file-name-p file)))
-         (shell-command-to-string
-          (format
-           "%s -batch -Q -L %s --eval %s"
-           (shell-quote-argument
-            (expand-file-name invocation-name invocation-directory))
-           (mapconcat #'shell-quote-argument load-path " -L ")
-           (shell-quote-argument (format code file))))))))))
+     (dolist (enabled '(t nil))
+       (dolist (default-directory
+                `(,temporary-file-directory
+                ;;  Starting Emacs in a directory which has
+                ;; `tramp-archive-file-name-regexp' syntax is
+                ;; supported only with Emacs > 27.2 (sigh!).
+                ;; (Bug#48476)
+                  ,(file-name-as-directory tramp-archive-test-directory)))
+       (dolist (file `("/mock::foo" ,(concat tramp-archive-test-archive "foo")))
+           (should
+            (string-match
+           (format
+            "tramp-archive loaded: %s[[:ascii:]]+tramp-archive loaded: %s"
+            (tramp-archive-file-name-p default-directory)
+            (or (tramp-archive-file-name-p default-directory)
+                (and enabled (tramp-archive-file-name-p file))))
+           (shell-command-to-string
+            (format
+             "%s -batch -Q -L %s --eval %s --eval %s"
+             (shell-quote-argument
+              (expand-file-name invocation-name invocation-directory))
+             (mapconcat #'shell-quote-argument load-path " -L ")
+             (shell-quote-argument
+              (format "(setq tramp-archive-enabled %s)" enabled))
+             (shell-quote-argument (format code file)))))))))))
  
 -(ert-deftest tramp-archive-test45-delay-load ()
 +(ert-deftest tramp-archive-test46-delay-load ()
    "Check that `tramp-archive' is loaded lazily, only when needed."
    :tags '(:expensive-test)
    (skip-unless tramp-archive-enabled)