[Emacs-diffs] Changes to emacs/lisp/net/tramp-ftp.el [lexbind]

[Miles Bader]

Index: emacs/lisp/net/tramp-ftp.el
diff -c emacs/lisp/net/tramp-ftp.el:1.2.4.1 emacs/lisp/net/tramp-ftp.el:1.2.4.2
*** emacs/lisp/net/tramp-ftp.el:1.2.4.1 Fri Apr  4 01:20:30 2003
--- emacs/lisp/net/tramp-ftp.el Tue Oct 14 19:39:26 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,142 ----
  
  ;; * 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.
  
+ ;;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff
  ;;; tramp-ftp.el ends here