emacs-29 41939127457: Fix Tramp (don't merge)

[Michael Albinus]

branch: emacs-29
commit 41939127457f0564217caef2d8740f8e0e816b9c
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Fix Tramp (don't merge)
    
    * lisp/net/tramp.el (tramp-read-id-output): Identifiers can contain "-".
---
 lisp/net/tramp.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d1b38cfeb93..29f5ffd68f0 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6399,20 +6399,20 @@ Set connection properties 
\"{uid,gid.groups}-{integer,string}\"."
       (goto-char (point-min))
       ;; Read uid.
       (when (re-search-forward
-            (rx "uid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")")
+            (rx "uid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
             nil 'noerror)
        (setq uid-integer (string-to-number (match-string 1))
              uid-string (match-string 2)))
       ;; Read gid.
       (when (re-search-forward
-            (rx "gid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")")
+            (rx "gid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
             nil 'noerror)
        (setq gid-integer (string-to-number (match-string 1))
              gid-string (match-string 2)))
       ;; Read groups.
       (when (re-search-forward (rx "groups=") nil 'noerror)
        (while (looking-at
-               (rx (group (+ digit)) "(" (group (+ (any "_" word))) ")"))
+               (rx (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")"))
          (setq groups-integer (cons (string-to-number (match-string 1))
                                     groups-integer)
                groups-string (cons (match-string 2) groups-string))