12 files changed, 455 insertions, 85 deletions

diff --git a/test/lisp/auth-source-pass-tests.el b/test/lisp/auth-source-pass-tests.el
index 15fd9ed7007..2afd803240e 100644
--- a/test/lisp/auth-source-pass-tests.el
+++ b/test/lisp/auth-source-pass-tests.el
@@ -91,7 +91,10 @@ This function is intended to be set to `auth-source-debug'."
              ((symbol-function 'auth-source-pass-entries) (lambda () (mapcar #'car ,store))))
      (let ((auth-source-debug #'auth-source-pass--debug)
            (auth-source-pass--debug-log nil)
-           (auth-source-pass--parse-log nil))
+           (auth-source-pass--parse-log nil)
+           ;; Any existing directory will do, since we shouldn't do I/O
+           ;; except for the guard in `auth-source-pass-search'.
+           (auth-source-pass-filename default-directory))
        ,@body)))
 
 (defun auth-source-pass--explain-match-entry-p (entry hostname &optional user port)
diff --git a/test/lisp/cus-edit-tests.el b/test/lisp/cus-edit-tests.el
index 67a377e9073..770a1549c56 100644
--- a/test/lisp/cus-edit-tests.el
+++ b/test/lisp/cus-edit-tests.el
@@ -90,7 +90,7 @@
               (erase-buffer))
             (setopt cus-edit-test-foo1 :foo)
             (buffer-substring-no-properties (point-min) (point-max)))))
-    (should (string-search "Value `:foo' for variable `cus-edit-test-foo1' does not match its type \"number\""
+    (should (string-search "Value does not match cus-edit-test-foo1's type `number': :foo\n"
                            warn-txt))))
 
 (defcustom cus-edit-test-bug63290-option nil
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 7d0ea1692ff..77ed07fcc42 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -658,5 +658,155 @@ The current directory at call time should not affect the result (Bug#50630)."
       (let ((default-directory test-dir-other))
         (files-tests--insert-directory-shows-given-free test-dir)))))
 
+(ert-deftest dired-test-filename-with-newline-1 () ; bug#79528, bug#80499
+  "Test handling of file name with literal embedded newline."
+  ;; File names with embedded newlines are not allowed on MS-Windows and
+  ;; MS-DOS.
+  (skip-when (memq system-type '(windows-nt ms-dos)))
+  (with-current-buffer "*Messages*"
+    (let ((inhibit-read-only t))
+      (erase-buffer)))
+  (let* ((dired-auto-toggle-b-switch nil)
+         (dir (ert-resource-file
+               (file-name-as-directory "filename-with-newline")))
+         (file (concat dir "filename\nwith newline"))
+         (buf (progn (make-empty-file file t)
+                     (dired (file-name-directory file))))
+         (warnbuf (get-buffer "*Warnings*")))
+    (should (dired--filename-with-newline-p))
+    (let ((beg (point))               ; beginning of file name
+          (_ (dired-move-to-end-of-filename)))
+      (should (search-backward "with newline")) ; literal space in file name
+      (should (search-backward "\n" beg))) ; literal newline in file name
+    (if noninteractive
+        (with-current-buffer "*Messages*"
+          (goto-char (point-min))
+          (should (search-forward
+                   "Warning (dired): Literal newline in file name.")))
+      (should (get-buffer-window warnbuf))
+      (with-current-buffer warnbuf
+        (goto-char (point-min))
+        (should (string-match
+                 (regexp-quote "Warning (dired): Literal newline in file name.")
+                 (buffer-substring (pos-bol) (pos-eol))))))
+    (kill-buffer buf)
+    (kill-buffer warnbuf)
+    (delete-directory dir t)))
+
+(ert-deftest dired-test-filename-with-newline-2 () ; bug#79528, bug#80499
+  "Test handling of file name with embedded newline using `b' switch."
+  ;; File names with embedded newlines are not allowed on MS-Windows and
+  ;; MS-DOS.
+  (skip-when (memq system-type '(windows-nt ms-dos)))
+  (with-current-buffer "*Messages*"
+    (let ((inhibit-read-only t))
+      (erase-buffer)))
+  (let* ((dired-auto-toggle-b-switch t)
+         (dir (ert-resource-file
+               (file-name-as-directory "filename-with-newline")))
+         (file (concat dir "filename\nwith newline"))
+         (buf (progn (make-empty-file file t)
+                     (dired-noselect (file-name-directory file))))
+         (warnbuf (get-buffer "*Warnings*")))
+    (with-current-buffer buf
+      (should (dired--filename-with-newline-p))
+      (dired--toggle-b-switch)
+      (let ((beg (point))               ; beginning of file name
+            (_ (dired-move-to-end-of-filename)))
+        (should (search-backward "with\\ newline")) ; result of ls -b switch
+        (should (search-backward "\\n" beg)))) ; result of ls -b switch
+    (if noninteractive
+        (with-current-buffer "*Messages*"
+          (goto-char (point-min))
+          (should-error (search-forward
+                         "Warning (dired): Literal newline in file name.")))
+      (should-not (get-buffer "*Warnings*")))
+    (kill-buffer buf)
+    (kill-buffer warnbuf)
+    (delete-directory dir t)))
+
+(ert-deftest dired-test-ls-error-message () ; bug#80499
+  "Test invoking `dired' on a nonexisting file.
+A buffer should pop up containing the error emitted by ls.  The buffer
+visiting the nonexisting file should killed before `dired' returns,
+hence another buffer should be returned."
+  (let* ((dir (ert-resource-file (file-name-as-directory "empty-dir")))
+         (name (concat dir "bla"))
+         ;; Use PARENT = t in make-directory call to avoid failing if
+         ;; the directyory already exists for some reason.
+         (buf (progn (make-directory dir t)
+                     (dired name))))
+    ;; This is for MS-Windows and MS-DOS in the default configuration.
+    (when (and (featurep 'ls-lisp)
+               (boundp 'ls-lisp-use-insert-directory-program)
+               (null ls-lisp-use-insert-directory-program))
+      (should (bufferp buf))
+      (should (equal (buffer-name buf) (file-name-nondirectory name)))
+      (with-current-buffer buf
+        ;; 'ls-lisp' creates a Dired buffer of just 3 lines, with
+        ;; "(No match)" on the last line
+        (should (string-match "(No match)" (buffer-string)))
+        (should (= 3 (line-number-at-pos (buffer-size) t)))))
+    ;; This is for Posix systems and for MS-Windows/DOS when they use 'ls'.
+    (unless (and (featurep 'ls-lisp)
+                 (boundp 'ls-lisp-use-insert-directory-program)
+                 (null ls-lisp-use-insert-directory-program))
+      (let ((errbuf (get-buffer "*ls error*")))
+        (should (get-buffer-window errbuf))
+        (should-not (equal (buffer-name buf) (file-name-nondirectory name)))
+        (with-current-buffer errbuf
+          (should (string-match-p
+                   (format
+                    ;; Use .* around file name to account for different
+                    ;; file-name quoting styles, or no quoting at all.
+                    "%s: cannot access .*%s.*: No such file or directory\n"
+                    insert-directory-program (file-name-nondirectory name))
+                   (buffer-string))))
+        (kill-buffer errbuf))
+      (delete-directory dir t))))
+
+
+(defun dired-test--filename-with-backslash-n ()
+  "Core of test `dired-test-filename-with-backslash-n'."
+  (let* ((dir (ert-resource-file
+               (file-name-as-directory "filename-with-backslash")))
+         (file (concat dir "C:\\nppdf32log\\debuglog.txt"))
+         (buf (progn (make-empty-file file t)
+                     (dired-noselect (file-name-directory file))))
+         (warnbuf (get-buffer "*Warnings*")))
+    (with-current-buffer buf
+      (should-not (dired--filename-with-newline-p))
+      (dired--toggle-b-switch)
+      (should-not (dired--filename-with-newline-p))
+      (let ((fn (car (directory-files dir t
+                                      directory-files-no-dot-files-regexp))))
+        (should (equal fn file))))
+    (if noninteractive
+        (with-current-buffer "*Messages*"
+          (goto-char (point-min))
+          (should-error (search-forward
+                         "Warning (dired): Literal newline in file name.")))
+      (should-not (get-buffer "*Warnings*")))
+    (kill-buffer buf)
+    (kill-buffer warnbuf)
+    (delete-directory dir t)))
+
+(ert-deftest dired-test-filename-with-backslash-n () ; bug#80608
+  "Test file name containing literal backslash-n sequence.
+Dired should not treat this sequence as a newline character, regardless
+of the value of `dired-auto-toggle-b-switch'."
+  ;; File names with backslashes in basename are not allowed on MS systems.
+  (skip-when (memq system-type '(windows-nt ms-dos)))
+  (with-current-buffer "*Messages*"
+    (let ((inhibit-read-only t))
+      (erase-buffer)))
+  (let ((dired-auto-toggle-b-switch nil))
+    (dired-test--filename-with-backslash-n))
+  (with-current-buffer "*Messages*"
+    (let ((inhibit-read-only t))
+      (erase-buffer)))
+  (let ((dired-auto-toggle-b-switch nil))
+    (dired-test--filename-with-backslash-n)))
+
 (provide 'dired-tests)
 ;;; dired-tests.el ends here
diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el
index da4a4d0fad7..cce28360eff 100644
--- a/test/lisp/erc/erc-track-tests.el
+++ b/test/lisp/erc/erc-track-tests.el
@@ -478,12 +478,28 @@
   (funcall set-faces '(erc-notice-face))
   (erc-track-modified-channels)
   (should (equal (alist-get (current-buffer) erc-modified-channels-alist)
-                 '(5 . erc-notice-face))))
+                 (if (gethash 'erc-notice-face erc-track--normal-faces)
+                     '(5 . erc-notice-face)
+                   '(5 erc-button-nick-default-face erc-nick-default-face)))))
 
 (ert-deftest erc-track-modified-channels/baseline ()
   (erc-tests-common-track-modified-channels
    #'erc-track-tests--modified-channels/baseline))
 
+;; This "baseline" variant simulates `erc-notice-face' being absent from
+;; `erc-track-faces-normal-list' by removing it from the cached local
+;; copy in `erc-track--normal-faces'.  When absent and a message
+;; highlighted in `erc-notice-face' is inserted, the mode line should
+;; not change if it's currently showing a face ranked higher in
+;; `erc-track-faces-priority-list'.  ERC 5.6 and 5.6.1 featured a
+;; regression that caused the mode line to keep alternating regardless.
+;; See Bug#80659: erc: Faces not being updated correctly.
+(ert-deftest erc-track-modified-channels/baseline/nonotice ()
+  (erc-tests-common-track-modified-channels
+   (lambda (set-faces)
+     (remhash 'erc-notice-face erc-track--normal-faces)
+     (funcall #'erc-track-tests--modified-channels/baseline set-faces))))
+
 (ert-deftest erc-track-modified-channels/baseline/mention ()
   (erc-tests-common-track-modified-channels
    (lambda (set-faces)
@@ -613,6 +629,15 @@
     (erc-tests-common-track-modified-channels
      #'erc-track-tests--modified-channels/baseline)))
 
+;; Option `erc-track-priority-faces-only' does not affect Bug#80659 (see
+;; baseline test without the option above).
+(ert-deftest erc-track-modified-channels/priority-only-all/baseline/nonotice ()
+  (let ((erc-track-priority-faces-only 'all))
+    (erc-tests-common-track-modified-channels
+     (lambda (set-faces)
+       (remhash 'erc-notice-face erc-track--normal-faces)
+       (funcall #'erc-track-tests--modified-channels/baseline set-faces)))))
+
 ;; This test simulates a common configuration that combines an
 ;; `erc-track-faces-priority-list' removed of `erc-notice-face' with
 ;; `erc-track-priority-faces-only' being `all'.  It also features in the
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index e6b2a0eb078..6781c4a3d8b 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1027,7 +1027,23 @@ unquoted file names."
                      (buffer-string)))))
   (files-tests--with-temp-non-special-and-file-name-handler
       (tmpdir nospecial-dir t)
-    (should-error (with-temp-buffer (insert-directory nospecial-dir "")))))
+    (if (memq system-type '(windows-nt ms-dos))
+        (should-error (with-temp-buffer (insert-directory nospecial-dir "")))
+      (with-temp-buffer (insert-directory nospecial-dir ""))
+      (let ((errbuf (get-buffer "*ls error*"))
+            ;; By the time `ls' is called in `insert-directory', the
+            ;; handler prefix has been removed.
+            (nospecial-dir (string-remove-prefix "/:" nospecial-dir)))
+        (should errbuf)
+        (with-current-buffer errbuf
+          (should (string-match-p
+                   (format
+                    ;; Use .* around file name to account for different
+                    ;; file-name quoting styles, or no quoting at all.
+                    "%s: cannot access .*%s.*: No such file or directory\n"
+                    insert-directory-program nospecial-dir)
+                   (buffer-string))))
+        (kill-buffer errbuf)))))
 
 (ert-deftest files-tests-file-name-non-special-insert-file-contents ()
   (files-tests--with-temp-non-special (tmpfile nospecial)
diff --git a/test/lisp/gnus/gnus-icalendar-tests.el b/test/lisp/gnus/gnus-icalendar-tests.el
index df9358b96c5..e668becd54d 100644
--- a/test/lisp/gnus/gnus-icalendar-tests.el
+++ b/test/lisp/gnus/gnus-icalendar-tests.el
@@ -35,7 +35,7 @@
   (let (event)
     (with-temp-buffer
       (insert ical-string)
-      (setq event (gnus-icalendar-event-from-buffer (buffer-name) participant)))
+      (setq event (gnus-icalendar-event-from-buffer (current-buffer) participant)))
     event))
 
 (ert-deftest gnus-icalendar-parse ()
@@ -94,7 +94,8 @@ END:VCALENDAR
           (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
           (should (eq (eieio-object-class event) 'gnus-icalendar-event-request))
           (should (not (gnus-icalendar-event:recurring-p event)))
-          (should (string= (gnus-icalendar-event:start event) "2020-12-08 15:00"))
+          (should (equal (gnus-icalendar-event:start event)
+                         "2020-12-08 15:00"))
           (with-slots (organizer summary description location end-time uid rsvp participation-type) event
                       (should (string= organizer "anoncompany.com_3bm6fh805bme9uoeliqcle1sag@group.calendar.google.com"))
                       (should (string= summary "Townhall | All Company Meeting"))
@@ -106,9 +107,20 @@ END:VCALENDAR
                       (should (eq participation-type 'non-participant))))
       (setenv "TZ" tz))))
 
+(defun gnus-icalendar-at/@ ()
+  "Replace \" <at> \" with \"@\" before parsing."
+  (goto-char (point-min))
+  (while (re-search-forward " <at> " nil t)
+    (replace-match "@")))
+
+;; FIXME: is "icalendary" (not "icalendar") intentional, here and below?
 (ert-deftest gnus-icalendary-byday ()
   ""
-  (let ((tz (getenv "TZ"))
+  (let* ((tz (getenv "TZ"))
+        (icalendar-pre-parsing-hook
+         ;; clean up " <at> " addresses so the parser doesn't choke...
+         ;; FIXME: can we just change the test data, or is this a real example?
+         '(gnus-icalendar-at/@))
         (event (gnus-icalendar-tests--get-ical-event "\
 BEGIN:VCALENDAR
 PRODID:Zimbra-Calendar-Provider
@@ -138,8 +150,8 @@ SUMMARY:appointment every weekday\\, start jul 24\\, 2020\\, end aug 24\\, 2020
 ATTENDEE;CN=Mark Hershberger;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP
  =TRUE:mailto:hexmode <at> gmail.com
 ORGANIZER;CN=Mark A. Hershberger:mailto:mah <at> nichework.com
-DTSTART;TZID=\"America/New_York\":20200724T090000
-DTEND;TZID=\"America/New_York\":20200724T093000
+DTSTART;TZID=America/New_York:20200724T090000
+DTEND;TZID=America/New_York:20200724T093000
 STATUS:CONFIRMED
 CLASS:PUBLIC
 X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
@@ -163,10 +175,12 @@ END:VCALENDAR" (list "Mark Hershberger"))))
           (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
     (should (eq (eieio-object-class event) 'gnus-icalendar-event-request))
     (should (gnus-icalendar-event:recurring-p event))
-    (should (string= (gnus-icalendar-event:recurring-interval event) "1"))
+    (should (= 1 (gnus-icalendar-event:recurring-interval event)))
     (should (string= (gnus-icalendar-event:start event) "2020-07-24 15:00"))
     (with-slots (organizer summary description location end-time uid rsvp participation-type) event
-      (should (string= organizer "mah <at> nichework.com"))
+      (should (string= organizer
+                       (replace-regexp-in-string " <at> " "@"
+                                                 "mah <at> nichework.com")))
       (should (string= summary "appointment every weekday, start jul 24, 2020, end aug 24, 2020"))
       (should (string= description "The following is a new meeting request:"))
       (should (null location))
@@ -236,7 +250,7 @@ END:VCALENDAR" (list "participant@anoncompany.com"))))
           (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
           (should (eq (eieio-object-class event) 'gnus-icalendar-event-request))
           (should (gnus-icalendar-event:recurring-p event))
-          (should (string= (gnus-icalendar-event:recurring-interval event) "1"))
+          (should (= 1 (gnus-icalendar-event:recurring-interval event)))
           (should (string= (gnus-icalendar-event:start event) "2020-09-15 14:00"))
           (with-slots (organizer summary description location end-time uid rsvp participation-type) event
             (should (string= organizer "anon@anoncompany.com"))
@@ -258,6 +272,29 @@ END:VCALENDAR" (list "participant@anoncompany.com"))))
 (ert-deftest gnus-icalendar-accept-with-comment ()
   ""
   (let ((event "\
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Berlin:20200915T140000
 DTEND;TZID=Europe/Berlin:20200915T143000
@@ -275,7 +312,8 @@ SEQUENCE:0
 STATUS:CONFIRMED
 SUMMARY:Casual coffee talk
 TRANSP:OPAQUE
-END:VEVENT")
+END:VEVENT
+END:VCALENDAR")
         (icalendar-identities '("participant@anoncompany.com")))
     (let* ((reply (with-temp-buffer
                     (insert event)
@@ -292,6 +330,29 @@ END:VEVENT")
 (ert-deftest gnus-icalendar-decline-without-changing-comment ()
   ""
   (let ((event "\
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Berlin:20200915T140000
 DTEND;TZID=Europe/Berlin:20200915T143000
@@ -310,7 +371,8 @@ SEQUENCE:0
 STATUS:CONFIRMED
 SUMMARY:Casual coffee talk
 TRANSP:OPAQUE
-END:VEVENT")
+END:VEVENT
+END:VCALENDAR")
         (icalendar-identities '("participant@anoncompany.com")))
     (let* ((reply (with-temp-buffer
                     (insert event)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 149fa1d2537..3972e5faa45 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5078,6 +5078,21 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                 (sort (file-name-all-completions "b" tmp-name) #'string-lessp)
                 '("bold" "boz/")))
               (should-not (file-name-all-completions "a" tmp-name))
+              ;; Symbolic links.
+              (tramp--test-ignore-make-symbolic-link-error
+               (make-symbolic-link
+                (file-name-concat tmp-name "foo")
+                (file-name-concat tmp-name "link1"))
+               (should (file-exists-p (expand-file-name "link1" tmp-name)))
+               (make-symbolic-link
+                (file-name-concat tmp-name "boz")
+                (file-name-concat tmp-name "link2"))
+               (should (file-exists-p (expand-file-name "link2" tmp-name)))
+               (should (equal (file-name-completion "li" tmp-name) "link"))
+               (should (member "link1" (file-name-all-completions "" tmp-name)))
+               (should (member "link2/" (file-name-all-completions "" tmp-name)))
+               (delete-file (file-name-concat tmp-name "link1"))
+               (delete-file (file-name-concat tmp-name "link2")))
               ;; `completion-regexp-list' restricts the completion to
               ;; files which match all expressions in this list.
               ;; Ange-FTP does not complete "".
@@ -6329,9 +6344,12 @@ INPUT, if non-nil, is a string sent to the process."
                    this-shell-command
                    "echo foo >&2; echo bar" (current-buffer) stderr)
                   (should (string-equal "bar\n" (buffer-string)))
-                  ;; Check stderr.
+                  ;; Check stderr.  Some shells echo, for example the
+                  ;; "adb" or container methods.
                   (should
-                   (string-equal "foo\n" (tramp-get-buffer-string stderr))))
+                   (string-match-p
+                    (rx bol (** 1 2 "foo\n") eol)
+                    (tramp-get-buffer-string stderr))))
 
               ;; Cleanup.
               (ignore-errors (kill-buffer stderr))))))
@@ -6896,8 +6914,7 @@ INPUT, if non-nil, is a string sent to the process."
   "Check `vc-registered'."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
-  (skip-unless (not (tramp--test-crypt-p)))
+  (skip-unless (tramp--test-supports-processes-p))
 
   (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
     ;; We must use `file-truename' for the temporary directory, in
@@ -6912,17 +6929,9 @@ INPUT, if non-nil, is a string sent to the process."
            (inhibit-message (not (ignore-errors (edebug-mode))))
            (vc-handled-backends
             (cond
-             ((tramp-find-executable
-               tramp-test-vec vc-git-program
-               (tramp-get-remote-path tramp-test-vec))
-              '(Git))
-             ((tramp-find-executable
-               tramp-test-vec vc-hg-program
-               (tramp-get-remote-path tramp-test-vec))
-              '(Hg))
-             ((tramp-find-executable
-               tramp-test-vec vc-bzr-program
-               (tramp-get-remote-path tramp-test-vec))
+             ((executable-find vc-git-program 'remote) '(Git))
+             ((executable-find vc-hg-program 'remote) '(Hg))
+             ((executable-find vc-bzr-program 'remote)
               (setq tramp-remote-process-environment
                     (cons (format "BZR_HOME=%s"
                                   (file-remote-p tmp-name1 'localname))
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 1c625d79ca2..4d9e468bee1 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -8012,6 +8012,7 @@ always located at the beginning of buffer."
     def test():"
 
    (setopt treesit-font-lock-level 4)
+   (font-lock-ensure)
    (dolist (test '("pytest" "mark" "skip"))
      (search-forward test)
      (goto-char (match-beginning 0))
@@ -8022,6 +8023,7 @@ always located at the beginning of buffer."
    "all()"
    ;; enable 'function' feature from 4th level
    (setopt treesit-font-lock-level 4)
+   (font-lock-ensure)
    (should (eq (face-at-point) 'font-lock-builtin-face))))
 
 (ert-deftest python-ts-mode-interpolation-nested-string ()
@@ -8050,6 +8052,7 @@ always located at the beginning of buffer."
    "t = f\"beg {True + var}\""
 
    (setopt treesit-font-lock-level 2)
+   (font-lock-ensure)
    (search-forward "f")
    (goto-char (match-beginning 0))
    (should (not (eq (face-at-point) 'font-lock-string-face)))
@@ -8068,6 +8071,7 @@ always located at the beginning of buffer."
          (setf (nth 2 treesit-font-lock-feature-list)
                (remq 'string-interpolation (nth 2 treesit-font-lock-feature-list)))
          (setopt treesit-font-lock-level 3)
+         (font-lock-ensure)
 
          (search-forward "f")
          (goto-char (match-beginning 0))
diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el
index 73f7be3145d..c1afa197c64 100644
--- a/test/lisp/ses-tests.el
+++ b/test/lisp/ses-tests.el
@@ -41,6 +41,19 @@
   (defvar B2)
   (defvar ses--toto))
 
+;; Check no border effects
+;; ======================================================================
+(defun ses-tests-check-no-border-effect ()
+  (dolist (symb ses-localvars)
+    (when (consp symb) (setq symb (car symb)))
+    (when (string-match "\\`ses--" (symbol-name symb))
+      (should (null (boundp symb))))))
+
+(defun ses-tests-unbind-local-vars ()
+  (dolist (symb ses-localvars)
+    (when (consp symb) (setq symb (car symb)))
+    (when (string-match "\\`ses--" (symbol-name symb)) (makunbound symb))))
+
 ;; PLAIN FORMULA TESTS
 ;; ======================================================================
 
@@ -48,24 +61,28 @@
   "Check that setting A1 to 1 and A2 to (1+ A1), makes A2 value
 equal to 2. This is done with low level functions calls, not like
 interactively."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'ses-cell-set-formula c)
         (apply 'ses-calculate-cell (list (car c) (cadr c) nil)))
-      (should (eq (bound-and-true-p A2) 2)))))
+      (should (eq (bound-and-true-p A2) 2))))
+  (ses-tests-check-no-border-effect))
 
 (ert-deftest ses-tests-plain-formula ()
   "Check that setting A1 to 1 and A2 to (1+ A1), makes A2 value
 equal to 2. This is done  using interactive calls."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook)
-      (should (eq (bound-and-true-p A2) 2)))))
+      (should (eq (bound-and-true-p A2) 2))))
+  (ses-tests-check-no-border-effect))
 
 ;; PLAIN CELL RENAMING TESTS
 ;; ======================================================================
@@ -75,6 +92,7 @@ equal to 2. This is done  using interactive calls."
 This is done using low level functions, `ses-rename-cell' is not
 called but instead we use text replacement in the buffer
 previously passed in text mode."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -90,11 +108,13 @@ previously passed in text mode."
       (should-not  (local-variable-p 'A1))
       (should (eq ses--foo 1))
       (should (equal (ses-cell-formula 1 0) '(ses-safe-formula (1+ ses--foo))))
-      (should (eq (bound-and-true-p A2) 2)))))
+      (should (eq (bound-and-true-p A2) 2))))
+  (ses-tests-check-no-border-effect))
 
 (ert-deftest ses-tests-renamed-cell ()
   "Check that renaming A1 to `ses--foo' and setting `ses--foo' to 1 and A2
 to (1+ ses--foo), makes A2 value equal to 2."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -105,11 +125,13 @@ to (1+ ses--foo), makes A2 value equal to 2."
       (should-not  (local-variable-p 'A1))
       (should (eq ses--foo 1))
       (should (equal (ses-cell-formula 1 0) '(1+ ses--foo)))
-      (should (eq (bound-and-true-p A2) 2)))))
+      (should (eq (bound-and-true-p A2) 2))))
+  (ses-tests-check-no-border-effect))
 
 (ert-deftest ses-tests-renamed-cell-after-setting ()
   "Check that setting A1 to 1 and A2 to (1+ A1), and then
 renaming A1 to `ses--foo' makes `ses--foo' value equal to 2."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -120,12 +142,14 @@ renaming A1 to `ses--foo' makes `ses--foo' value equal to 2."
       (should-not  (local-variable-p 'A1))
       (should (eq ses--foo 1))
       (should (equal (ses-cell-formula 1 0) '(1+ ses--foo)))
-      (should (eq (bound-and-true-p A2) 2)))))
+      (should (eq (bound-and-true-p A2) 2))))
+  (ses-tests-check-no-border-effect))
 
 (ert-deftest ses-tests-renaming-cell-with-one-symbol-formula ()
   "Check that setting A1 to 1 and A2 to A1, and then renaming A1
 to `ses--foo' makes `ses--foo' value equal to 1. Then set A1 to 2 and check
 that `ses--foo' becomes 2."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(3 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -141,7 +165,8 @@ that `ses--foo' becomes 2."
       (funcall-interactively 'ses-edit-cell 0 0 2)
       (ses-command-hook); deferred recalc
       (should (eq (bound-and-true-p A2) 2))
-      (should (eq ses--foo 2)))))
+      (should (eq ses--foo 2))))
+  (ses-tests-check-no-border-effect))
 
 
 ;; ROW INSERTION TESTS
@@ -151,6 +176,7 @@ that `ses--foo' becomes 2."
   "Check that setting A1 to 1 and A2 to (1+ A1), and then jumping
 to A2 and inserting a row, makes A2 value empty, and A3 equal to
 2."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -161,13 +187,15 @@ to A2 and inserting a row, makes A2 value empty, and A3 equal to
       (ses-insert-row 1)
       (ses-command-hook)
       (should-not (bound-and-true-p A2))
-      (should (eq (bound-and-true-p A3) 2)))))
+      (should (eq (bound-and-true-p A3) 2))))
+  (ses-tests-check-no-border-effect))
 
 
 (ert-deftest ses-tests-renamed-cells-row-insertion ()
   "Check that setting A1 to 1 and A2 to (1+ A1), and then renaming A1 to `ses--foo' and A2 to `ses--bar' jumping
 to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
 2."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
@@ -183,13 +211,15 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
       (ses-insert-row 1)
       (ses-command-hook)
       (should-not (bound-and-true-p A2))
-      (should (eq ses--bar 2)))))
+      (should (eq ses--bar 2))))
+  (ses-tests-check-no-border-effect))
 
 
 ;; JUMP tests
 ;; ======================================================================
-(ert-deftest ses-jump-B2-prefix-arg ()
+(ert-deftest ses-tests-jump-B2-prefix-arg ()
   "Test jumping to cell B2 by use of prefix argument"
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(3 . 3))
         ses-after-entry-functions)
     (with-temp-buffer
@@ -197,41 +227,49 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
       ;; C-u 4 M-x ses-jump
       (let ((current-prefix-arg 4))
         (call-interactively 'ses-jump))
-      (should (eq (ses--cell-at-pos (point)) 'B2)))))
+      (should (eq (ses--cell-at-pos (point)) 'B2))))
+  (ses-tests-check-no-border-effect))
 
 
-(ert-deftest ses-jump-B2-lowcase ()
+(ert-deftest ses-tests-jump-B2-lowcase ()
   "Test jumping to cell B2 by use of lowercase cell name string"
-    (let ((ses-initial-size '(3 . 3))
-          ses-after-entry-functions)
-      (with-temp-buffer
-        (ses-mode)
-        (funcall-interactively 'ses-jump "b2")
-        (ses-command-hook)
-        (should (eq (ses--cell-at-pos (point)) 'B2)))))
-
-(ert-deftest ses-jump-B2-lowcase-keys ()
+  (ses-tests-unbind-local-vars)
+  (let ((ses-initial-size '(3 . 3))
+        ses-after-entry-functions)
+    (with-temp-buffer
+      (ses-mode)
+      (funcall-interactively 'ses-jump "b2")
+      (ses-command-hook)
+      (should (eq (ses--cell-at-pos (point)) 'B2))))
+  (ses-tests-check-no-border-effect))
+
+(ert-deftest ses-tests-jump-B2-lowcase-keys ()
   "Test jumping to cell B2 by use of lowercase cell name string with simulating keys"
-    (let ((ses-initial-size '(3 . 3))
-          ses-after-entry-functions)
-      (with-temp-buffer
-        (ses-mode)
-        (ert-simulate-keys [ ?b ?2 return] (ses-jump))
-        (ses-command-hook)
-        (should (eq (ses--cell-at-pos (point)) 'B2)))))
-
-(ert-deftest ses-jump-B2-symbol ()
+  (ses-tests-unbind-local-vars)
+  (let ((ses-initial-size '(3 . 3))
+        ses-after-entry-functions)
+    (with-temp-buffer
+      (ses-mode)
+      (ert-simulate-keys [ ?b ?2 return] (ses-jump))
+      (ses-command-hook)
+      (should (eq (ses--cell-at-pos (point)) 'B2))))
+  (ses-tests-check-no-border-effect))
+
+(ert-deftest ses-tests-jump-B2-symbol ()
   "Test jumping to cell B2 by use of cell name symbol"
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(3 . 3))
         ses-after-entry-functions)
     (with-temp-buffer
       (ses-mode)
       (funcall-interactively 'ses-jump 'B2)
       (ses-command-hook)
-      (should (eq (ses--cell-at-pos (point)) 'B2)))))
+      (should (eq (ses--cell-at-pos (point)) 'B2))))
+  (ses-tests-check-no-border-effect))
 
-(ert-deftest ses-jump-B2-renamed ()
+(ert-deftest ses-tests-jump-B2-renamed ()
   "Test jumping to cell B2 after renaming it `ses--toto'."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(3 . 3))
         ses-after-entry-functions)
     (with-temp-buffer
@@ -239,12 +277,14 @@ to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
       (ses-rename-cell 'ses--toto (ses-get-cell 1 1))
       (ses-jump 'ses--toto)
       (ses-command-hook)
-      (should (eq (ses--cell-at-pos (point)) 'ses--toto)))))
+      (should (eq (ses--cell-at-pos (point)) 'ses--toto))))
+  (ses-tests-check-no-border-effect))
 
-(ert-deftest ses-set-formula-write-cells-with-changed-references ()
+(ert-deftest ses-tests-set-formula-write-cells-with-changed-references ()
   "Test fix of bug#5852.
 When setting a formula has some cell with changed references, this
 cell has to be rewritten to data area."
+  (ses-tests-unbind-local-vars)
   (let ((ses-initial-size '(4 . 3))
         (ses-after-entry-functions nil))
     (with-temp-buffer
@@ -261,7 +301,8 @@ cell has to be rewritten to data area."
       (ses-command-hook)
       (should (equal (ses-cell-references 1 1) '(B3)))
       (ses-mode)
-      (should (equal (ses-cell-references 1 1) '(B3))))))
+      (should (equal (ses-cell-references 1 1) '(B3)))))
+  (ses-tests-check-no-border-effect))
 
 (provide 'ses-tests)
 
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 3d4f524d630..791b06f9edf 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -1700,32 +1700,38 @@ final or penultimate step during initialization."))
     (should (equal (funcall (subr--identity #'all) #'plusp ls) nil))
     (should (equal (funcall (subr--identity #'all) #'numberp ls) t))))
 
-(ert-deftest subr-any ()
-  (should (equal (any #'hash-table-p nil) nil))
+(ert-deftest subr-member-if ()
+  (should (equal (member-if #'hash-table-p nil) nil))
   (let ((ls (append '(3 2 1) '(0) '(-1 -2 -3))))
-    (should (equal (any #'numberp ls) ls))
-    (should (equal (any (lambda (x) (numberp x)) ls) ls))
-    (should (equal (any #'plusp ls) ls))
-    (should (equal (any #'zerop ls) '(0 -1 -2 -3)))
-    (should (equal (any #'bufferp ls) nil))
+    (should (equal (member-if #'numberp ls) ls))
+    (should (equal (member-if (lambda (x) (numberp x)) ls) ls))
+    (should (equal (member-if #'plusp ls) ls))
+    (should (equal (member-if #'zerop ls) '(0 -1 -2 -3)))
+    (should (equal (member-if #'bufferp ls) nil))
     (let ((z 9))
-      (should (equal (any (lambda (x) (< x z)) ls) ls))
-      (should (equal (any (lambda (x) (< x (- z 9))) ls) '(-1 -2 -3)))
-      (should (equal (any (lambda (x) (> x z)) ls) nil)))
-    (should (equal (funcall (subr--identity #'any) #'minusp ls) '(-1 -2 -3)))
-    (should (equal (funcall (subr--identity #'any) #'stringp ls) nil))))
-
-(defun subr-tests--any-memql (x xs)
-  "Like `memql', but exercising the `compiler-macro' of `any'.
+      (should (equal (member-if (lambda (x) (< x z)) ls) ls))
+      (should (equal (member-if (lambda (x) (< x (- z 9))) ls)
+                     '(-1 -2 -3)))
+      (should (equal (member-if (lambda (x) (> x z)) ls) nil)))
+    (should (equal (funcall (subr--identity #'member-if) #'minusp ls)
+                   '(-1 -2 -3)))
+    (should (equal (funcall (subr--identity #'member-if) #'stringp ls) nil))))
+
+(defun subr-tests--member-if-memql (x xs)
+  "Like `memql', but exercising the `compiler-macro' of `member-if'.
 The argument names are important."
-  (any (lambda (y) (eql x y)) xs))
+  (member-if (lambda (y) (eql x y)) xs))
 
-(ert-deftest subr-any-compiler-macro ()
-  "Test `compiler-macro' of `any'."
+(ert-deftest subr-member-if-compiler-macro ()
+  "Test `compiler-macro' of `member-if'."
   (let ((xs (number-sequence 0 4)))
     (dotimes (x (1+ (length xs)))
-      (should (eq (subr-tests--any-memql x xs)
-                  (memql x xs))))))
+      (should (eq (subr-tests--member-if-memql x xs)
+                  (memql x xs)))))
+  (let ((n 0))
+    (member-if (prog1 (lambda (x) (eq x 5)) (incf n))
+               (number-sequence 0 4))
+    (should (eq n 1))))
 
 (ert-deftest total-line-spacing ()
   (progn
diff --git a/test/lisp/xt-mouse-tests.el b/test/lisp/xt-mouse-tests.el
index 26fe5002b68..b065fda5eed 100644
--- a/test/lisp/xt-mouse-tests.el
+++ b/test/lisp/xt-mouse-tests.el
@@ -50,8 +50,7 @@
                      ;; `xterm-mouse-mode' doesn't work in the initial
                      ;; terminal.  Since we can't create a second
                      ;; terminal in batch mode, fake it temporarily.
-                     (cl-letf (((symbol-function 'terminal-name)
-                                (lambda (&optional _terminal) "fake-terminal")))
+                     (cl-letf (((symbol-function 'frame-initial-p) #'ignore))
                        (xterm-mouse-mode 1))
                      ,@body)
                  (xterm-mouse-mode 0))))
diff --git a/test/src/terminal-tests.el b/test/src/terminal-tests.el
new file mode 100644
index 00000000000..85c4fa04efc
--- /dev/null
+++ b/test/src/terminal-tests.el
@@ -0,0 +1,55 @@
+;;; terminal-tests.el --- tests for terminal.c -*- lexical-binding: t -*-
+
+;; Copyright (C) 2026 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest frame-initial-p ()
+  "Test `frame-initial-p' behavior."
+  (should-not (frame-initial-p t))
+  (should-not (frame-initial-p (current-buffer)))
+  (should-not (frame-initial-p (selected-window)))
+  ;; "Initial frame" implies "initial terminal", and
+  ;; no other terminal can have the initial frame.
+  (should-not (xor (equal (terminal-name) "initial_terminal")
+                   (frame-initial-p)))
+  ;; Initial frame implies its terminal is a termcap-like
+  ;; text-mode terminal.
+  (should (or (not (frame-initial-p))
+              (eq (terminal-live-p nil) t)))
+  ;; It similarly implies a termcap-like text-mode frame.
+  (should (or (not (frame-initial-p))
+              (eq (frame-live-p (selected-frame)) t)))
+  (dolist (ft (append '(nil) (frame-list) (terminal-list)))
+    (ert-info ((prin1-to-string ft) :prefix "Argument: ")
+      (should-not (xor (equal (terminal-name ft) "initial_terminal")
+                       (frame-initial-p ft)))
+      (should (or (not (frame-initial-p ft))
+                  (eq (terminal-live-p ft) t)))))
+  (cond (noninteractive
+         ;; Batch mode should have an initial frame.
+         (should (any #'frame-initial-p (frame-list)))
+         (should (any #'frame-initial-p (terminal-list))))
+        ((not (daemonp))
+         ;; Non-daemon interactive mode should have none.
+         (should-not (any #'frame-initial-p (frame-list)))
+         (should-not (any #'frame-initial-p (terminal-list))))))
+
+;;; terminal-tests.el ends here