diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 29 |
2 files changed, 23 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e27169961e..f379ea70434 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2000-11-16 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-file-writable-p) | ||
| 4 | (ange-ftp-file-readable-p, ange-ftp-file-executable-p): Bind | ||
| 5 | ange-ftp-process-verbose to nil. | ||
| 6 | |||
| 1 | 2000-11-15 Dave Love <fx@gnu.org> | 7 | 2000-11-15 Dave Love <fx@gnu.org> |
| 2 | 8 | ||
| 3 | * wid-edit.el (widget-specify-field, widget-specify-button): If | 9 | * wid-edit.el (widget-specify-field, widget-specify-button): If |
| @@ -19,7 +25,7 @@ | |||
| 19 | 2000-11-15 Gerd Moellmann <gerd@gnu.org> | 25 | 2000-11-15 Gerd Moellmann <gerd@gnu.org> |
| 20 | 26 | ||
| 21 | * faces.el (face-set-after-frame-default): If | 27 | * faces.el (face-set-after-frame-default): If |
| 22 | `inhibit-default-face-x-resources' is bound, don't intiialize the | 28 | `inhibit-default-face-x-resources' is bound, don't intialize the |
| 23 | default face from X resources. | 29 | default face from X resources. |
| 24 | 30 | ||
| 25 | 2000-11-15 Eli Zaretskii <eliz@is.elta.co.il> | 31 | 2000-11-15 Eli Zaretskii <eliz@is.elta.co.il> |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index d02f0577c45..a6b986ceba0 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -3373,23 +3373,26 @@ system TYPE.") | |||
| 3373 | (ange-ftp-real-file-newer-than-file-p f1 f2)))) | 3373 | (ange-ftp-real-file-newer-than-file-p f1 f2)))) |
| 3374 | 3374 | ||
| 3375 | (defun ange-ftp-file-writable-p (file) | 3375 | (defun ange-ftp-file-writable-p (file) |
| 3376 | (setq file (expand-file-name file)) | 3376 | (let ((ange-ftp-process-verbose nil)) |
| 3377 | (if (ange-ftp-ftp-name file) | 3377 | (setq file (expand-file-name file)) |
| 3378 | (or (file-exists-p file) ;guess here for speed | 3378 | (if (ange-ftp-ftp-name file) |
| 3379 | (file-directory-p (file-name-directory file))) | 3379 | (or (file-exists-p file) ;guess here for speed |
| 3380 | (ange-ftp-real-file-writable-p file))) | 3380 | (file-directory-p (file-name-directory file))) |
| 3381 | (ange-ftp-real-file-writable-p file)))) | ||
| 3381 | 3382 | ||
| 3382 | (defun ange-ftp-file-readable-p (file) | 3383 | (defun ange-ftp-file-readable-p (file) |
| 3383 | (setq file (expand-file-name file)) | 3384 | (let ((ange-ftp-process-verbose nil)) |
| 3384 | (if (ange-ftp-ftp-name file) | 3385 | (setq file (expand-file-name file)) |
| 3385 | (file-exists-p file) | 3386 | (if (ange-ftp-ftp-name file) |
| 3386 | (ange-ftp-real-file-readable-p file))) | 3387 | (file-exists-p file) |
| 3388 | (ange-ftp-real-file-readable-p file)))) | ||
| 3387 | 3389 | ||
| 3388 | (defun ange-ftp-file-executable-p (file) | 3390 | (defun ange-ftp-file-executable-p (file) |
| 3389 | (setq file (expand-file-name file)) | 3391 | (let ((ange-ftp-process-verbose nil)) |
| 3390 | (if (ange-ftp-ftp-name file) | 3392 | (setq file (expand-file-name file)) |
| 3391 | (file-exists-p file) | 3393 | (if (ange-ftp-ftp-name file) |
| 3392 | (ange-ftp-real-file-executable-p file))) | 3394 | (file-exists-p file) |
| 3395 | (ange-ftp-real-file-executable-p file)))) | ||
| 3393 | 3396 | ||
| 3394 | (defun ange-ftp-delete-file (file) | 3397 | (defun ange-ftp-delete-file (file) |
| 3395 | (interactive "fDelete file: ") | 3398 | (interactive "fDelete file: ") |