projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
acee0a8
)
Fix Bug#33364
author
Michael Albinus
<michael.albinus@gmx.de>
Wed, 14 Nov 2018 15:19:39 +0000
(16:19 +0100)
committer
Michael Albinus
<michael.albinus@gmx.de>
Wed, 14 Nov 2018 15:19:39 +0000
(16:19 +0100)
* lisp/net/tramp.el (tramp-parse-sconfig-group): Support also
"Host host1 host2 ..." syntax. (Bug#33364)
lisp/net/tramp.el
patch
|
blob
|
history
diff --git
a/lisp/net/tramp.el
b/lisp/net/tramp.el
index 98ec8415c746cdd1b847ddc89be5c27eb1a5e751..e9f5f7d43476ba36bf5243aeb8ca687dd126b3ba 100644
(file)
--- a/
lisp/net/tramp.el
+++ b/
lisp/net/tramp.el
@@
-2739,7
+2739,9
@@
User is always nil."
"Return a (user host) tuple allowed to access.
User is always nil."
(tramp-parse-group
- (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)") 1 ","))
+ (concat "\\(?:^[ \t]*Host\\)" "\\|" "\\(?:^.+\\)"
+ "\\|" "\\(" tramp-host-regexp "\\)")
+ 1 "[ \t]+"))
;; Generic function.
(defun tramp-parse-shostkeys-sknownhosts (dirname regexp)