Mercurial > emacs
changeset 8397:4cb8a2ab8f60
(ange-ftp-parse-netrc-group): Don't move back to line
beginning. Skip the machine name whatever it may be.
(ange-ftp-parse-netrc): Skip initial whitespace.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 31 Jul 1994 18:22:04 +0000 |
| parents | 8085e84cac68 |
| children | 38513039d818 |
| files | lisp/ange-ftp.el |
| diffstat | 1 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ange-ftp.el Sun Jul 31 17:11:50 1994 +0000 +++ b/lisp/ange-ftp.el Sun Jul 31 18:22:04 1994 +0000 @@ -851,7 +851,7 @@ ;;;; Internal variables. ;;;; ------------------------------------------------------------ -(defconst ange-ftp-version "$Revision: 1.54 $") +(defconst ange-ftp-version "$Revision: 1.55 $") (defvar ange-ftp-data-buffer-name " *ftp data*" "Buffer name to hold directory listing data received from ftp process.") @@ -1157,12 +1157,22 @@ ;; record the information found. (defun ange-ftp-parse-netrc-group () - (beginning-of-line) (let ((start (point)) - (end (progn (re-search-forward "machine\\|default" - (point-max) 'end 2) (point))) + (end (save-excursion + (if (looking-at "machine\\>") + ;; Skip `machine' and the machine name that follows. + (progn + (skip-chars-forward "^ \t\n") + (skip-chars-forward " \t\n") + (skip-chars-forward "^ \t\n")) + ;; Skip `default'. + (skip-chars-forward "^ \t\n")) + ;; Find start of the next `machine' or `default' + ;; or the end of the buffer. + (if (re-search-forward "machine\\>\\|default\\>" nil t) + (match-beginning 0) + (point-max)))) machine login password account) - (goto-char start) (setq machine (ange-ftp-parse-netrc-token "machine" end) login (ange-ftp-parse-netrc-token "login" end) password (ange-ftp-parse-netrc-token "password" end) @@ -1219,6 +1229,7 @@ (mapcar 'funcall find-file-hooks) (setq buffer-file-name nil) (goto-char (point-min)) + (skip-chars-forward " \t\n") (while (not (eobp)) (ange-ftp-parse-netrc-group)) (kill-buffer (current-buffer)))