From eb922adfdb19296c02fec37559b3374fc7a0b71a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 15 Apr 2013 11:43:20 +0200 Subject: [PATCH] * net/ange-ftp.el (ange-ftp-run-real-handler-orig): New defun, uses code from the previous `ange-ftp-run-real-handler'. (ange-ftp-run-real-handler): Set it to `tramp-run-real-handler' only in case that function exist. This is needed for proper unloading of Tramp. --- lisp/ChangeLog | 8 ++++++++ lisp/net/ange-ftp.el | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34711b72c3e..f3db36db290 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2013-04-15 Michael Albinus + + * net/ange-ftp.el (ange-ftp-run-real-handler-orig): New defun, + uses code from the previous `ange-ftp-run-real-handler'. + (ange-ftp-run-real-handler): Set it to `tramp-run-real-handler' + only in case that function exist. This is needed for proper + unloading of Tramp. + 2013-04-15 Tassilo Horn * textmodes/reftex-vars.el (reftex-label-regexps): New defcustom. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 2b8c7ae145b..f6efc56023a 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4437,16 +4437,18 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") ;;; Define ways of getting at unmodified Emacs primitives, ;;; turning off our handler. -;(defun ange-ftp-run-real-handler (operation args) -; (let ((inhibit-file-name-handlers -; (cons 'ange-ftp-hook-function -; (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))) - -(defalias 'ange-ftp-run-real-handler 'tramp-run-real-handler) +(defun ange-ftp-run-real-handler-orig (operation args) + (let ((inhibit-file-name-handlers + (cons 'ange-ftp-hook-function + (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))) + +(defalias 'ange-ftp-run-real-handler + (if (fboundp 'tramp-run-real-handler) + 'tramp-run-real-handler 'ange-ftp-run-real-handler-orig)) (defun ange-ftp-real-file-name-directory (&rest args) (ange-ftp-run-real-handler 'file-name-directory args)) -- 2.39.2