diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-04-27 23:44:39 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-04-27 23:44:39 +0000 |
| commit | 78cf4176e7ba3fe1900999ab90b364069f31589e (patch) | |
| tree | 0efd300f6be74c4c7e7b09e50164ce98d3d67430 /lisp/ange-ftp.el | |
| parent | 48beffe14cd5c61fd87798a7dd0fc203de0fe34c (diff) | |
| download | emacs-78cf4176e7ba3fe1900999ab90b364069f31589e.tar.gz | |
(ange-ftp-hook-function): Use ange-ftp-run-real-handler.
(ange-ftp-run-real-handler): Inhibit ange-ftp-completion-hook-function
as well as ange-ftp-hook-function.
Diffstat (limited to 'lisp/ange-ftp.el')
| -rw-r--r-- | lisp/ange-ftp.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index 6d3c11614a2..3d589cf3097 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el @@ -851,7 +851,7 @@ SIZE, if supplied, should be a prime number." ;;;; Internal variables. ;;;; ------------------------------------------------------------ -(defconst ange-ftp-version "$Revision: 1.47 $") +(defconst ange-ftp-version "$Revision: 1.48 $") (defvar ange-ftp-data-buffer-name " *ftp data*" "Buffer name to hold directory listing data received from ftp process.") @@ -3785,8 +3785,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (defun ange-ftp-hook-function (operation &rest args) (let ((fn (get operation 'ange-ftp))) (if fn (apply fn args) - (let (file-name-handler-alist) - (apply operation args))))) + (ange-ftp-run-real-handler operation args)))) ;;; This regexp takes care of real ange-ftp file names (with a slash @@ -3864,8 +3863,9 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (defun ange-ftp-run-real-handler (operation args) (let ((inhibit-file-name-handlers (cons 'ange-ftp-hook-function - (and (eq inhibit-file-name-operation operation) - inhibit-file-name-handlers))) + (cons 'ange-ftp-completion-hook-function + (and (eq inhibit-file-name-operation operation) + inhibit-file-name-handlers)))) (inhibit-file-name-operation operation)) (apply operation args))) |