From 802a2ae21ff07fa801aa8de843a9b9d496fb459a Mon Sep 17 00:00:00 2001
From: Mike Lamb
Date: Mon, 23 Jan 2012 00:12:10 -0800
Subject: Handle comments in eshell-read-hosts-file (tiny change)

* lisp/eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines.

Fixes: debbugs:10549
---
 lisp/eshell/esh-util.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/eshell')

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index f111fd91230..8218e91ddc7 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -483,7 +483,7 @@ list."
       (insert-file-contents eshell-hosts-file)
       (goto-char (point-min))
       (while (re-search-forward
-	      "^\\(\\S-+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t)
+	      "^\\([^#[:space:]]+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t)
 	(if (match-string 1)
 	    (add-to-list 'hosts (match-string 1)))
 	(if (match-string 2)
-- 
cgit v1.2.1


From d7128bb16449d0b4f0d9735bed049cf5e03d61e9 Mon Sep 17 00:00:00 2001
From: Mike Lamb
Date: Mon, 23 Jan 2012 00:18:22 -0800
Subject: * lisp/eshell/esh-util.el (pcomplete/ssh): Remove alias.  (tiny
 change) There is a better pcomplete/ssh defined in pcmpl-unix.el.

Fixes: debbugs:10548
---
 lisp/eshell/em-unix.el | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lisp/eshell')

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index f24180b5c7f..296e2ee8b24 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -792,8 +792,6 @@ external command."
   (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1))
 	       pcomplete-default-completion-function)))
 
-(defalias 'pcomplete/ssh 'pcomplete/rsh)
-
 (defvar block-size)
 (defvar by-bytes)
 (defvar dereference-links)
-- 
cgit v1.2.1