2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96c18714709..297043fa12b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-23  Mike Lamb  <mrlamb@gmail.com>  (tiny change)
+
+        * eshell/esh-util.el (eshell-read-hosts-file):
+        Skip comment lines.  (Bug#10549)
+
 2012-01-23  Juanma Barranquero  <lekktu@gmail.com>
 
         * subr.el (display-delayed-warnings): Doc fix.
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)