[Emacs-diffs] /srv/bzr/emacs/trunk r112291: * net/ange-ftp.el (ange-ftp-run-real-handler-orig): New defun,

[Michael Albinus]

------------------------------------------------------------
revno: 112291
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Mon 2013-04-15 11:43:20 +0200
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-15 07:55:05 +0000
+++ b/lisp/ChangeLog    2013-04-15 09:43:20 +0000
@@ -1,3 +1,11 @@
+2013-04-15  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * textmodes/reftex-vars.el (reftex-label-regexps): New defcustom.

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2013-02-13 04:31:09 +0000
+++ b/lisp/net/ange-ftp.el      2013-04-15 09:43:20 +0000
@@ -4437,16 +4437,18 @@
 ;;; 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)))
+(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 'tramp-run-real-handler)
+(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))