(ange-ftp-completion-hook-function): Use new inhibit vars.

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 1bba1ef7dae..b3654ec3656 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -244,7 +244,11 @@ and ignores this variable.")
 (defun ange-ftp-completion-hook-function (op &rest args)
   (if (memq op '(file-name-completion file-name-all-completions))
       (apply 'ange-ftp-hook-function op args)
-    (let (file-name-handler-alist)
+    (let ((inhibit-file-name-handlers
+           (cons 'ange-ftp-completion-hook-function
+                 (and (eq inhibit-file-name-operation op)
+                      inhibit-file-name-handlers)))
+          (inhibit-file-name-operation op))
       (apply op args))))
 
 (defun pwd ()