diff options
| author | Michael Albinus | 2012-02-24 09:11:00 +0100 |
|---|---|---|
| committer | Michael Albinus | 2012-02-24 09:11:00 +0100 |
| commit | 914260cdbd985a2021b4905eedc8151afd226e06 (patch) | |
| tree | a92ee1ae8a52accbae40cbe8041271284546b521 | |
| parent | 50fc698ea889b2439723497ddde594b19db209d5 (diff) | |
| download | emacs-914260cdbd985a2021b4905eedc8151afd226e06.tar.gz emacs-914260cdbd985a2021b4905eedc8151afd226e06.zip | |
* net/ange-ftp.el (ange-ftp-parse-netrc): Suppress comment lines. (Bug#10874)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 3 |
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 @@ | |||
| 1 | 2012-02-24 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-parse-netrc): Suppress comment lines. | ||
| 4 | (Bug#10874) | ||
| 5 | |||
| 1 | 2012-02-23 Alan Mackenzie <acm@muc.de> | 6 | 2012-02-23 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | * emacs-lisp/easy-mmode.el (define-minor-mode): Add extra | 8 | * 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." | |||
| 1390 | (run-hooks 'find-file-hook) | 1390 | (run-hooks 'find-file-hook) |
| 1391 | (setq buffer-file-name nil) | 1391 | (setq buffer-file-name nil) |
| 1392 | (goto-char (point-min)) | 1392 | (goto-char (point-min)) |
| 1393 | (while (search-forward-regexp "^[ \t]*#.*$" nil t) | ||
| 1394 | (replace-match "")) | ||
| 1395 | (goto-char (point-min)) | ||
| 1393 | (skip-chars-forward " \t\r\n") | 1396 | (skip-chars-forward " \t\r\n") |
| 1394 | (while (not (eobp)) | 1397 | (while (not (eobp)) |
| 1395 | (ange-ftp-parse-netrc-group)) | 1398 | (ange-ftp-parse-netrc-group)) |