summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2012-02-24 09:11:00 +0100
committerMichael Albinus <michael.albinus@gmx.de>2012-02-24 09:11:00 +0100
commit914260cdbd985a2021b4905eedc8151afd226e06 (patch)
treea92ee1ae8a52accbae40cbe8041271284546b521
parent50fc698ea889b2439723497ddde594b19db209d5 (diff)
downloademacs-914260cdbd985a2021b4905eedc8151afd226e06.tar.gz
* net/ange-ftp.el (ange-ftp-parse-netrc): Suppress comment lines. (Bug#10874)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/ange-ftp.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 220ffd72d82..46d8ca44a0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-24 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/ange-ftp.el (ange-ftp-parse-netrc): Suppress comment lines.
+ (Bug#10874)
+
2012-02-23 Alan Mackenzie <acm@muc.de>
* emacs-lisp/easy-mmode.el (define-minor-mode): Add extra
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 4338cdff3cd..2a44148e4ce 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1390,6 +1390,9 @@ only return the directory part of FILE."
(run-hooks 'find-file-hook)
(setq buffer-file-name nil)
(goto-char (point-min))
+ (while (search-forward-regexp "^[ \t]*#.*$" nil t)
+ (replace-match ""))
+ (goto-char (point-min))
(skip-chars-forward " \t\r\n")
(while (not (eobp))
(ange-ftp-parse-netrc-group))