pcmpl-ssh-known-hosts tiny change

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

Fixes: debbugs:10533

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 571a5e284a24fa383421ffffc92cc32cacaee498..a907bd43f38386673f49896ea1466aea98a3e80d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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).

diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 2dc25d93abf60959e2eab8947efce3810e637194..3af22c82dfbf90f983c63e57f2e83bd4dea087a6 100644 (file)
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -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 ()