diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2022-08-26 16:19:47 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2022-08-26 16:19:47 +0200 |
commit | be2e6228f8c9c57d2809bdd953d065ebfc63d4c4 (patch) | |
tree | 8f1ecc68c987f88be3fbfd9eb0bd6b24a2483df5 /lisp/net/tramp-integration.el | |
parent | 4cb31b19353d3d1f8629d7c7b55aff2445efc02a (diff) | |
download | emacs-be2e6228f8c9c57d2809bdd953d065ebfc63d4c4.tar.gz |
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
Diffstat (limited to 'lisp/net/tramp-integration.el')
-rw-r--r-- | lisp/net/tramp-integration.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 226113d8800..946f9725022 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -85,7 +85,8 @@ special handling of `substitute-in-file-name'." (defun tramp-rfn-eshadow-update-overlay-regexp () "An overlay covering the shadowed part of the filename." - (format "[^%s/~]*\\(/\\|~\\)" tramp-postfix-host-format)) + (rx-to-string + `(: (* (not (any ,tramp-postfix-host-format "/~"))) (or "/" "~")))) (defun tramp-rfn-eshadow-update-overlay () "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input. @@ -215,9 +216,13 @@ NAME must be equal to `tramp-current-connection'." ;; Create a pseudo mode `tramp-info-lookup-mode' for Tramp symbol lookup. (info-lookup-maybe-add-help :mode 'tramp-info-lookup-mode :topic 'symbol - :regexp "[^][()`'‘’,\" \t\n]+" - :doc-spec '(("(tramp)Function Index" nil "^ -+ .*: " "\\( \\|$\\)") - ("(tramp)Variable Index" nil "^ -+ .*: " "\\( \\|$\\)"))) + :regexp (rx (+ (not (any "\t\n \"'(),[]`‘’")))) + :doc-spec '(("(tramp)Function Index" nil + (rx bol " " (+ "-") " " (* nonl) ": ") + (rx (group (| " " eol)))) + ("(tramp)Variable Index" nil + (rx bol " " (+ "-") " " (* nonl) ": ") + (rx (group (| " " eol)))))) (add-hook 'tramp-integration-unload-hook |