master 2adce1839db 7/7: Merge from origin/emacs-31

branch: master
commit 2adce1839db773c2a45ab6b506a5f92452d314ce
Merge: c7c131c30d2 7d01f8f7a4e
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Merge from origin/emacs-31
    
    7d01f8f7a4e Fix syntax of tsx tag angle brackets to use matching pairs
    43ff22a0d1f ; * etc/NEWS: Presentational fixes and improvements.
    d837ba1ed60 ; * etc/NEWS: Fix broken reference to standard-mode-line-...
    3b22019ff0d Fix Tramp container name completion
    e45a83cb700 ; * etc/NEWS: Document mode line minimum widths change (b...
    5d6a13136ad server-tests/can-create-frames-p: Check for TERM=dumb-ema...
    a07abfc6bc8 ; * test/lisp/emacs-lisp/package-tests.el (lm-version): D...
    
    # Conflicts:
    #       etc/NEWS
---
 etc/NEWS.31                           | 7 +++++++
 lisp/net/tramp-container.el           | 4 ++--
 lisp/progmodes/typescript-ts-mode.el  | 4 ++--
 test/lisp/emacs-lisp/package-tests.el | 2 ++
 test/lisp/server-tests.el             | 3 ++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/etc/NEWS.31 b/etc/NEWS.31
index 8e7d035bf84..89c8e592f9c 100644
--- a/etc/NEWS.31
+++ b/etc/NEWS.31
@@ -617,6 +617,13 @@ The command 'mode-line-invisible-mode' toggles the visibility of the
 current-buffer's mode line.  The default is to show the mode line of
 every buffer.
 
+---
+*** Standard mode line no longer specifies minimum widths.
+The default values for the 'mode-line-position' variable and
+'mode-line-format' user option no longer specify any minimum widths.  If
+you use a proportional font for your mode line, you may need to
+customize the values of these variables to include minimum widths again.
+
 ** Tab Bars and Tab Lines
 
 ---
diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index fec2e16a624..dabc03f990b 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -290,14 +290,14 @@ see its function help for a description of the format."
   (tramp-skeleton-completion-function method
     (when-let* ((raw-list
 		 (shell-command-to-string
-		  (concat program " ps --format '{{.ID}}\t{{.Names}}'")))
+		  (concat program " ps --format '{{.ID}}<>{{.Names}}'")))
 		(lines (split-string raw-list "\n" 'omit))
 		(names
 		 (tramp-compat-seq-keep
 		  (lambda (line)
 		    (when (string-match
 			   (rx bol (group (1+ nonl))
-			       "\t" (? (group (1+ nonl))) eol)
+			       "<>" (? (group (1+ nonl))) eol)
 			   line)
 		      (or (match-string 2 line) (match-string 1 line))))
 		  lines)))
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 61e281310aa..cf13363e48a 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -860,8 +860,8 @@ at least 3 (which is the default value)."
               (match-beginning 0) (match-end 0)
               'syntax-table (string-to-syntax
                              (cond
-                              ((equal (match-string 0) "<") "(<")
-                              ((equal (match-string 0) ">") ")>")
+                              ((equal (match-string 0) "<") "(>")
+                              ((equal (match-string 0) ">") ")<")
                               (t ".")))))))))))
 
 ;;;###autoload
diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index b6fb9005e4c..eac92290349 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -1028,6 +1028,8 @@ but with a different end of line convention (bug#48137)."
             (list new-pkg-desc simple-depend-desc-2 simple-depend-desc-1
                   multi-file-desc simple-depend-desc simple-single-desc)))))
 
+(declare-function lm-version "lisp-mnt")
+
 (ert-deftest package-test-builtin-package-info ()
   "Test public interfaces for querying package info."
   (should (not (null (package-versioned-builtin-packages))))
diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el
index a96dc85074d..5e7938abf52 100644
--- a/test/lisp/server-tests.el
+++ b/test/lisp/server-tests.el
@@ -25,7 +25,8 @@
 
 (defconst server-tests/can-create-frames-p
   (and (not (memq system-type '(windows-nt ms-dos)))
-       (not (member (getenv "TERM") '("dumb" "" nil)))
+       (not (member (getenv "TERM")
+                    '("dumb" "dumb-emacs-ansi" "" nil)))
        (or (not (eq system-type 'cygwin))
            (featurep 'gfilenotify)
            (featurep 'dbus)