[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 3287a7c: Fix Bug#33364
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-26 3287a7c: Fix Bug#33364 |
Date: |
Wed, 14 Nov 2018 10:19:50 -0500 (EST) |
branch: emacs-26
commit 3287a7c048c0c2efc9da59ecd4a12f56f42bb044
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Fix Bug#33364
* lisp/net/tramp.el (tramp-parse-sconfig-group): Support also
"Host host1 host2 ..." syntax. (Bug#33364)
---
lisp/net/tramp.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 98ec841..e9f5f7d 100644
--- 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 3287a7c: Fix Bug#33364,
Michael Albinus <=