From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 27 Apr 1994 23:44:39 +0000 (+0000)
Subject: (ange-ftp-hook-function): Use ange-ftp-run-real-handler.
X-Git-Tag: emacs-19.34~8710
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe8fd4091778445d0ad37c31905e9033572635f7;p=emacs.git

(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.
---

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)))