diff options
| author | Erik Naggum <erik@naggum.no> | 1995-10-28 05:42:48 +0000 |
|---|---|---|
| committer | Erik Naggum <erik@naggum.no> | 1995-10-28 05:42:48 +0000 |
| commit | d87b3b339015045ef1ba63bc8d156b47d4e10252 (patch) | |
| tree | aebbf2443d8c4a88c2719bd00e622b4cb1e08de9 /lisp/ange-ftp.el | |
| parent | e48e5617b02aedccf3022fefed1b3cf79fce7681 (diff) | |
| download | emacs-d87b3b339015045ef1ba63bc8d156b47d4e10252.tar.gz | |
(ange-ftp-ftp-name,ange-ftp-replace-name-component): Use posix-string-match
for complex regexp in `ange-ftp-name-format'.
(ange-ftp-process-sentinel): Quote final * in buffer name match.
Diffstat (limited to 'lisp/ange-ftp.el')
| -rw-r--r-- | lisp/ange-ftp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index 5e427b7126e..cd43215632e 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el @@ -1276,7 +1276,7 @@ Optional DEFAULT is password to start with." (setq ange-ftp-ftp-name-arg name ange-ftp-ftp-name-res (save-match-data - (if (string-match (car ange-ftp-name-format) name) + (if (posix-string-match (car ange-ftp-name-format) name) (let* ((ns (cdr ange-ftp-name-format)) (host (ange-ftp-ftp-name-component 0 ns name)) (user (ange-ftp-ftp-name-component 1 ns name)) @@ -1290,7 +1290,7 @@ Optional DEFAULT is password to start with." ;; replace the name component with NAME. (defun ange-ftp-replace-name-component (fullname name) (save-match-data - (if (string-match (car ange-ftp-name-format) fullname) + (if (posix-string-match (car ange-ftp-name-format) fullname) (let* ((ns (cdr ange-ftp-name-format)) (elt (nth 2 ns))) (concat (substring fullname 0 (match-beginning elt)) @@ -1523,7 +1523,7 @@ good, skip, fatal, or unknown." (defun ange-ftp-process-sentinel (proc str) "When ftp process changes state, nuke all file-entries in cache." (let ((name (process-name proc))) - (if (string-match "\\*ftp \\([^@]+\\)@\\([^*]+\\)*" name) + (if (string-match "\\*ftp \\([^@]+\\)@\\([^*]+\\)\\*" name) (let ((user (substring name (match-beginning 1) (match-end 1))) (host (substring name (match-beginning 2) (match-end 2)))) (ange-ftp-wipe-file-entries host user)))) |