Fix rx forms in Tramp

* lisp/net/tramp.el (tramp-restricted-shell-hosts-alist)
(tramp-local-host-regexp, tramp-echoed-echo-mark-regexp)
(tramp-login-prompt-regexp, tramp-terminal-prompt-regexp)
(tramp-antispoof-regexp)
(tramp-build-completion-file-name-regexp)
(tramp-debug-outline-regexp)
(tramp-use-absolute-autoload-file-names)
(tramp-lock-file-info-regexp, tramp-shell-quote-argument):
* lisp/net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls)
* lisp/net/tramp-cache.el (tramp-flush-file-function):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name):
* lisp/net/tramp-integration.el (tramp-rfn-eshadow-update-overlay-regexp)
(info-lookup-maybe-add-help):
* lisp/net/tramp-sh.el (tramp-default-user-alist, tramp-sunos-unames)
(tramp-scp-direct-remote-copying, tramp-get-remote-locale):
* lisp/net/tramp-smb.el (tramp-smb-prompt, tramp-smb-wrong-passwd-regexp)
(tramp-smb-errors, tramp-smb-get-localname)
(tramp-smb-read-file-entry): Simplify rx forms.

* lisp/net/tramp.el (tramp-handle-find-backup-file-name)
(tramp-handle-lock-file, tramp-handle-make-auto-save-file-name):
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times)
(tramp-adb-maybe-open-connection):
* lisp/net/tramp-gvfs.el
(tramp-gvfs-file-attributes-with-gvfs-ls-regexp):
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell): Do not use
`eval-when-compile'.

* lisp/net/tramp-cmds.el (tramp-rename-files, tramp-rename-these-files):
Use rx.

* lisp/net/tramp-gvfs.el (tramp-gvfs-password-tcrypt): New defonst.
(tramp-gvfs-handle-file-attributes): Use `number-to-string'.

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test17-insert-directory):
* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory)
(tramp--test-share-p): Simplify rx forms.

2 files changed, 9 insertions, 9 deletions

diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index 964404b4bf7..aa5d1cc496c 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -622,7 +622,7 @@ This checks also `file-name-as-directory', `file-name-directory',
             (goto-char (point-min))
             (should
              (looking-at-p
-              (rx bol (+ nonl) " " (literal tramp-archive-test-archive) eol))))
+              (rx bol (+ nonl) space (literal tramp-archive-test-archive) eol))))
           (with-temp-buffer
             (insert-directory
              (file-name-as-directory tramp-archive-test-archive)
@@ -633,14 +633,14 @@ This checks also `file-name-as-directory', `file-name-directory',
               (rx-to-string
                `(:
                  ;; There might be a summary line.
-                 (? "total" (+ nonl) (+ digit) (? " ")
+                 (? "total" (+ nonl) (+ digit) (? space)
                     (? (any "EGKMPTYZk")) (? "i") (? "B") "\n")
                  ;; We don't know in which order the files appear.
                  (= ,(length (directory-files tramp-archive-test-archive))
-                    (+ nonl) " "
+                    (+ nonl) space
                     (regexp
                      ,(regexp-opt (directory-files tramp-archive-test-archive)))
-                    (? " ->" (one-or-more nonl)) "\n"))))))
+                    (? " ->" (+ nonl)) "\n"))))))
           ;; Check error case.
           (with-temp-buffer
             (should-error
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index bc67ff2ace7..fed1d881c57 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3222,13 +3222,13 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
               (insert-directory tmp-name1 "-al")
               (goto-char (point-min))
               (should
-               (looking-at-p (rx bol (+ nonl) " " (literal tmp-name1) eol))))
+               (looking-at-p (rx bol (+ nonl) space (literal tmp-name1) eol))))
             (with-temp-buffer
               (insert-directory (file-name-as-directory tmp-name1) "-al")
               (goto-char (point-min))
               (should
                (looking-at-p
-                (rx bol (+ nonl) " " (literal tmp-name1) "/" eol))))
+                (rx bol (+ nonl) space (literal tmp-name1) "/" eol))))
             (with-temp-buffer
               (insert-directory
                (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p)
@@ -3238,11 +3238,11 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
                 (rx-to-string
                  `(:
                    ;; There might be a summary line.
-                   (? "total" (+ nonl) (+ digit) (? " ")
+                   (? "total" (+ nonl) (+ digit) (? space)
                       (? (any "EGKMPTYZk")) (? "i") (? "B") "\n")
                    ;; We don't know in which order ".", ".." and "foo" appear.
                    (= ,(length (directory-files tmp-name1))
-                      (+ nonl) " "
+                      (+ nonl) space
                       (regexp ,(regexp-opt (directory-files tmp-name1)))
                       (? " ->" (+ nonl)) "\n"))))))
 
@@ -6703,7 +6703,7 @@ Additionally, ls does not support \"--dired\"."
   "Check, whether the method needs a share."
   (and (tramp--test-gvfs-p)
        (string-match-p
-        (rx bol (or "afp" (: "dav" (opt "s")) "smb") eol)
+        (rx bol (| "afp" (: "dav" (? "s")) "smb") eol)
         (file-remote-p ert-remote-temporary-file-directory 'method))))
 
 (defun tramp--test-sshfs-p ()