commit e7260d4eb3ed1bebcaa9e2b934f162d4bb42e413 (HEAD, refs/remotes/origin/master)
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Sep 23 18:30:00 2024 +0300

    ; Fix shr-tests when Emacs was built without libxml2
    
    * test/lisp/net/shr-tests.el (shr-test/zoom-image): Skip if
    libxml2 is not available.  (Bug#73440)

diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index f8559df5272..d0fe8031ed4 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -136,6 +136,7 @@ settings, then once more for each (OPTION . VALUE) pair.")
 (ert-deftest shr-test/zoom-image ()
   "Test that `shr-zoom-image' properly replaces the original image."
   (skip-unless (bound-and-true-p image-types))
+  (skip-unless (libxml-available-p))
   (let* ((image (expand-file-name "data/image/blank-100x200.png"
                                   (getenv "EMACS_TEST_DIRECTORY")))
          (image-url (concat "file://" (if (string-prefix-p "/" image)

commit 40e0257b1084b0243b5fcc972068fbce41fd9629
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Sep 23 16:52:01 2024 +0200

    Extend tramp-otp-password-prompt-regexp
    
    * lisp/net/tramp.el (tramp-otp-password-prompt-regexp): Add TACC
    HPC prompt.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 19737bb5e54..732eb930937 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -700,12 +700,15 @@ The `sudo' program appears to insert a `^@' character into the prompt."
 (defcustom tramp-otp-password-prompt-regexp
   (rx-to-string
    `(: bol (* nonl)
-       ;; JumpCloud.
-       (group (| "Verification code"))
+       (group (|
+	 ;; JumpCloud.
+	 "Verification code"
+	 ;; TACC HPC.  <https://docs.tacc.utexas.edu/basics/mfa/>
+	 "TACC Token Code"))
        (* nonl) (any . ,tramp-compat-password-colon-equivalents) (* blank)))
   "Regexp matching one-time password prompts.
 The regexp should match at end of buffer."
-  :version "29.2"
+  :version "30.2"
   :type 'regexp
   :link '(tramp-info-link :tag "Tramp manual" tramp-otp-password-prompt-regexp))
 

commit dda7abb177b8eec537b18abb978fcbcb61dd8af1
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Sep 23 09:53:17 2024 +0200

    * doc/misc/tramp.texi (Frequently Asked Questions): Improve indices.

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a0a0a7164fb..5d26fc03336 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -6017,6 +6017,8 @@ $ export EDITOR=/path/to/emacsclient.sh
 @item
 How to determine whether a buffer is remote?
 
+@findex file-remote-p
+@vindex default-directory
 The buffer-local variable @code{default-directory} tells this.  If the
 form @code{(file-remote-p default-directory)} returns non-@code{nil},
 the buffer is remote.  See the optional arguments of