diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2018-07-21 12:29:06 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2018-07-21 12:29:06 +0200 |
commit | e0f33ea394c636ab1aa2412b4f35b7dfc1ca768a (patch) | |
tree | 1a97f9cac5cb99889bb38256fdf2753d5c76afd4 /lisp/shadowfile.el | |
parent | 7308fa0e2b8d929a4e0f7f54ac46228f93674672 (diff) | |
download | emacs-e0f33ea394c636ab1aa2412b4f35b7dfc1ca768a.tar.gz |
Fix Bug#32226
* lisp/shadowfile.el (shadow-site-name, shadow-name-site):
Use "[-.[:word:]]+" as hostname regexp. (Bug#32226)
* test/lisp/shadowfile-tests.el (shadow-test06-literal-groups)
(shadow-test07-regexp-groups, shadow-test08-shadow-todo)
(shadow-test09-shadow-copy-files): Skip if needed.
Diffstat (limited to 'lisp/shadowfile.el')
-rw-r--r-- | lisp/shadowfile.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el index e1a9b8e1d98..27d934d9fce 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -231,12 +231,12 @@ information defining the cluster. For interactive use, call (defun shadow-site-name (site) "Return name if SITE has the form \"/name:\", otherwise SITE." - (if (string-match "\\`/\\(\\w+\\):\\'" site) + (if (string-match "\\`/\\([-.[:word:]]+\\):\\'" site) (match-string 1 site) site)) (defun shadow-name-site (name) "Return \"/name:\" if NAME has word syntax, otherwise NAME." - (if (string-match "\\`\\w+\\'" name) + (if (string-match "\\`[-.[:word:]]+\\'" name) (format "/%s:"name) name)) (defun shadow-site-primary (site) |