[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp-ftp.el
From: |
Kai Großjohann |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp-ftp.el |
Date: |
Tue, 08 Apr 2003 16:06:12 -0400 |
Index: emacs/lisp/net/tramp-ftp.el
diff -c emacs/lisp/net/tramp-ftp.el:1.2 emacs/lisp/net/tramp-ftp.el:1.3
*** emacs/lisp/net/tramp-ftp.el:1.2 Wed Feb 5 16:03:36 2003
--- emacs/lisp/net/tramp-ftp.el Tue Apr 8 16:06:11 2003
***************
*** 94,111 ****
(save-match-data
(or (boundp 'ange-ftp-name-format)
(require 'ange-ftp))
! (let* ((ange-ftp-name-format
! (list (nth 0 tramp-file-name-structure)
! (nth 3 tramp-file-name-structure)
! (nth 2 tramp-file-name-structure)
! (nth 4 tramp-file-name-structure)))
! (inhibit-file-name-handlers
! (list 'tramp-file-name-handler
! 'tramp-completion-file-name-handler
! (and (eq inhibit-file-name-operation operation)
! inhibit-file-name-handlers)))
! (inhibit-file-name-operation operation))
! (apply 'ange-ftp-hook-function operation args))))
(defun tramp-ftp-file-name-p (filename)
"Check if it's a filename that should be forwarded to Ange-FTP."
--- 94,118 ----
(save-match-data
(or (boundp 'ange-ftp-name-format)
(require 'ange-ftp))
! (let ((ange-ftp-name-format
! (list (nth 0 tramp-file-name-structure)
! (nth 3 tramp-file-name-structure)
! (nth 2 tramp-file-name-structure)
! (nth 4 tramp-file-name-structure))))
! (cond
! ;; If argument is a symlink, 'file-directory-p` and 'file-exists-p`
! ;; call the traversed file recursively. So we cannot disable the
! ;;file-name-handler this case.
! ((memq operation '(file-directory-p file-exists-p))
! (apply 'ange-ftp-hook-function operation args))
! ;; Normally, the handlers must be discarded
! (t (let* ((inhibit-file-name-handlers
! (list 'tramp-file-name-handler
! 'tramp-completion-file-name-handler
! (and (eq inhibit-file-name-operation operation)
! inhibit-file-name-handlers)))
! (inhibit-file-name-operation operation))
! (apply 'ange-ftp-hook-function operation args)))))))
(defun tramp-ftp-file-name-p (filename)
"Check if it's a filename that should be forwarded to Ange-FTP."
***************
*** 127,136 ****
;; * In case of "/ftp:host:file" this works only for functions which
;; are defined in `tramp-file-name-handler-alist'. Call has to be
! ;; pretended in `tramp-file-name-handler' otherwise. Looks like
! ;; `ange-ftp-completion-hook-function' and `ange-ftp-hook-function'
! ;; are active temporarily in `file-name-handler-alist'.
! ;; Furthermore, there are no backup files on FTP hosts this case.
;; Worth further investigations.
;;; tramp-ftp.el ends here
--- 134,141 ----
;; * In case of "/ftp:host:file" this works only for functions which
;; are defined in `tramp-file-name-handler-alist'. Call has to be
! ;; pretended in `tramp-file-name-handler' otherwise.
! ;; Furthermore, there are no backup files on FTP hosts.
;; Worth further investigations.
;;; tramp-ftp.el ends here