andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pcmpl-ssh-known-hosts tiny change

Browse source 
* lisp/pcmpl-unix.el (pcmpl-ssh-known-hosts): Handle [host]:port syntax.

Fixes: debbugs:10533
This commit is contained in:
Mike Lamb 2012-01-27 13:14:16 -08:00 • committed by Glenn Morris
parent 2aa43abb72
commit 7dd37071d0
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-01-27 Mike Lamb <mrlamb@gmail.com> (tiny change)
* pcmpl-unix.el (pcmpl-ssh-known-hosts):
Handle [host]:port syntax. (Bug#10533)
2012-01-27 Alex Harsanyi <harsanyi@mac.com>
* xml.el (xml-parse-tag): Fix parsing of comments (Bug#10405).

14
lisp/pcmpl-unix.el
View file

@ -152,13 +152,15 @@ documentation), this function returns nil."
(file-readable-p pcmpl-ssh-known-hosts-file))
(with-temp-buffer
(insert-file-contents-literally pcmpl-ssh-known-hosts-file)
(let (ssh-hosts-list)
(while (re-search-forward "^ *\\([-.[:alnum:]]+\\)[, ]" nil t)
(add-to-list 'ssh-hosts-list (match-string 1))
(let ((host-re "\\(?:\\([-.[:alnum:]]+\\)\\|\\[\\([-.[:alnum:]]+\\)\\]:[0-9]+\\)[, ]")
ssh-hosts-list)
(while (re-search-forward (concat "^ *" host-re) nil t)
(add-to-list 'ssh-hosts-list (concat (match-string 1)
(match-string 2)))
(while (and (looking-back ",")
(re-search-forward "\\([-.[:alnum:]]+\\)[, ]"
(line-end-position) t))
(add-to-list 'ssh-hosts-list (match-string 1))))
(re-search-forward host-re (line-end-position) t))
(add-to-list 'ssh-hosts-list (concat (match-string 1)
(match-string 2)))))
ssh-hosts-list))))
(defun pcmpl-ssh-config-hosts ()