[Emacs-diffs] /srv/bzr/emacs/trunk r106916: Handle comments in eshell-read-hosts-file (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 106916
fixes bug(s): http://debbugs.gnu.org/10549
author: Mike Lamb <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-23 00:12:10 -0800
message:
  Handle comments in eshell-read-hosts-file (tiny change)
  
  * lisp/eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines.
modified:
  lisp/ChangeLog
  lisp/eshell/esh-util.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-23 02:10:36 +0000
+++ b/lisp/ChangeLog    2012-01-23 08:12:10 +0000
@@ -1,3 +1,8 @@
+2012-01-23  Mike Lamb  <address@hidden>  (tiny change)
+
+       * eshell/esh-util.el (eshell-read-hosts-file):
+       Skip comment lines.  (Bug#10549)
+
 2012-01-23  Juanma Barranquero  <address@hidden>
 
        * subr.el (display-delayed-warnings): Doc fix.

=== modified file 'lisp/eshell/esh-util.el'
--- a/lisp/eshell/esh-util.el   2012-01-19 07:21:25 +0000
+++ b/lisp/eshell/esh-util.el   2012-01-23 08:12:10 +0000
@@ -483,7 +483,7 @@
       (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)