[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#10549: 24.0.92; eshell-read-hosts-file - does not skip comment lines

From: Mike Lamb
Subject: bug#10549: 24.0.92; eshell-read-hosts-file - does not skip comment lines
Date: Wed, 18 Jan 2012 16:41:56 -0500

This patch modifies the regex in eshell-read-hosts-file to skip comment lines:

*** old/lisp/eshell/esh-util.el 2012-01-05 04:46:05.000000000 -0500
--- /Users/mrl/proj/emacs_trunk/lisp/eshell/esh-util.el 2012-01-18 
14:23:31.000000000 -0500
*** 483,489 ****
        (insert-file-contents eshell-hosts-file)
        (goto-char (point-min))
        (while (re-search-forward
!             "^\\(\\S-+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t)
        (if (match-string 1)
            (add-to-list 'hosts (match-string 1)))
        (if (match-string 2)
--- 483,489 ----
        (insert-file-contents eshell-hosts-file)
        (goto-char (point-min))
        (while (re-search-forward
!             "^\\([^#[:space:]]+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" 
nil t)
        (if (match-string 1)
            (add-to-list 'hosts (match-string 1)))
        (if (match-string 2)

In GNU Emacs (x86_64-apple-darwin11.2.0, NS apple-appkit-1138.23)
 of 2012-01-18 on anvil.home
Windowing system distributor `Apple', version 10.3.1138
configured using `configure  '--with-ns' '--without-x''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: en_US.UTF-8
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: EShell

Minor modes in effect:
  tooltip-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<return> C-x k <return> M-x r e p o r t - <tab> <r

Recent messages:
Decrypting /Users/mrl/.authinfo.gpg...done
235 2.7.0 Accepted
250 2.1.0 OK 17sm465789ang.11
250 2.1.5 OK 17sm465789ang.11
354  Go ahead 17sm465789ang.11
Sending email 
Sending email done
250 2.0.0 OK 1326921581 17sm465789ang.11
221 2.0.0 closing connection 17sm465789ang.11

Load-path shadows:
None found.

(epa-file epa derived epg epg-config gnutls network-stream starttls tls
mailalias multi-isearch newcomment shadow sort mail-extr message
format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse
rfc2231 mailabbrev gmm-utils mailheader emacsbug help-mode view
pcmpl-unix ansi-color em-unix pcomplete comint em-term term disp-table
ehelp electric em-script em-prompt em-ls em-hist em-pred em-glob em-dirs
em-cmpl em-basic esh-opt em-banner em-alias ring esh-var esh-io esh-cmd
esh-ext esh-proc esh-arg eldoc help-fns esh-groups eshell esh-module
esh-mode esh-util server smtpmail auth-source eieio byte-opt bytecomp
byte-compile cconv macroexp assoc gnus-util password-cache sendmail
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils dired-x
easymenu dired regexp-opt edmacro kmacro time-date tooltip ediff-hook
vc-hooks lisp-float-type mwheel ns-win tool-bar dnd fontset image fringe
lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar
mouse jit-lock font-lock syntax facemenu font-core frame cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev
minibuffer loaddefs button faces cus-face files text-properties overlay
sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process dbusbind ns
multi-tty emacs)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]