diff options
| author | Richard M. Stallman | 1994-03-04 01:33:43 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-03-04 01:33:43 +0000 |
| commit | 17b85a9b30e38659f1703ef16a84a106d2f345df (patch) | |
| tree | e2efa1036ff69d4fa2c092eb40e618717179e984 /lisp | |
| parent | b28e2cc6b06d0774b2a3dcc6d5f8cbd806deff6e (diff) | |
| download | emacs-17b85a9b30e38659f1703ef16a84a106d2f345df.tar.gz emacs-17b85a9b30e38659f1703ef16a84a106d2f345df.zip | |
(ange-ftp-nslookup-host, ange-ftp-start-process):
Bind default-directory to some accessible directory, if necessary.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ange-ftp.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index 54b30035d23..2d2cd2fa296 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el | |||
| @@ -857,7 +857,7 @@ SIZE, if supplied, should be a prime number." | |||
| 857 | ;;;; Internal variables. | 857 | ;;;; Internal variables. |
| 858 | ;;;; ------------------------------------------------------------ | 858 | ;;;; ------------------------------------------------------------ |
| 859 | 859 | ||
| 860 | (defconst ange-ftp-version "$Revision: 1.41 $") | 860 | (defconst ange-ftp-version "$Revision: 1.42 $") |
| 861 | 861 | ||
| 862 | (defvar ange-ftp-data-buffer-name " *ftp data*" | 862 | (defvar ange-ftp-data-buffer-name " *ftp data*" |
| 863 | "Buffer name to hold directory listing data received from ftp process.") | 863 | "Buffer name to hold directory listing data received from ftp process.") |
| @@ -1726,7 +1726,11 @@ been queued with no result. CONT will still be called, however." | |||
| 1726 | "Attempt to resolve the given HOSTNAME using nslookup if possible." | 1726 | "Attempt to resolve the given HOSTNAME using nslookup if possible." |
| 1727 | (interactive "sHost: ") | 1727 | (interactive "sHost: ") |
| 1728 | (if ange-ftp-nslookup-program | 1728 | (if ange-ftp-nslookup-program |
| 1729 | (let ((proc (start-process " *nslookup*" " *nslookup*" | 1729 | (let ((default-directory |
| 1730 | (if (file-accessible-directory-p default-directory) | ||
| 1731 | default-directory | ||
| 1732 | exec-directory)) | ||
| 1733 | (proc (start-process " *nslookup*" " *nslookup*" | ||
| 1730 | ange-ftp-nslookup-program host)) | 1734 | ange-ftp-nslookup-program host)) |
| 1731 | (res host)) | 1735 | (res host)) |
| 1732 | (process-kill-without-query proc) | 1736 | (process-kill-without-query proc) |
| @@ -1751,6 +1755,10 @@ on the gateway machine to do the ftp instead." | |||
| 1751 | ange-ftp-gateway-ftp-program-name | 1755 | ange-ftp-gateway-ftp-program-name |
| 1752 | ange-ftp-ftp-program-name)) | 1756 | ange-ftp-ftp-program-name)) |
| 1753 | (args (append (list ftp-prog) ange-ftp-ftp-program-args)) | 1757 | (args (append (list ftp-prog) ange-ftp-ftp-program-args)) |
| 1758 | (default-directory | ||
| 1759 | (if (file-accessible-directory-p default-directory) | ||
| 1760 | default-directory | ||
| 1761 | exec-directory)) | ||
| 1754 | proc) | 1762 | proc) |
| 1755 | (if use-gateway | 1763 | (if use-gateway |
| 1756 | (if ange-ftp-gateway-program-interactive | 1764 | (if ange-ftp-gateway-program-interactive |