diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-10-04 21:44:08 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-10-04 21:44:08 +0200 |
| commit | 4a93e698f3524e7e8feee2715967ebb0ef673232 (patch) | |
| tree | cffb3870cdc01494994c70471297d19a471a91fb /lisp/net/tramp-gvfs.el | |
| parent | d23832a2cc30f28e1d754fcd4a497c8ba7ca5b18 (diff) | |
| download | emacs-4a93e698f3524e7e8feee2715967ebb0ef673232.tar.gz | |
Continue reorganization of load dependencies. (Bug#7156)
* net/tramp.el (tramp-handle-file-local-copy-hook)
(tramp-delete-temp-file-function): Move down.
(tramp-exists-file-name-handler): Move up.
(tramp-register-file-name-handlers): Simplify autoload.
(tramp-handle-write-region-hook, tramp-handle-directory-file-name)
(tramp-handle-directory-files, tramp-handle-dired-uncache)
(tramp-handle-file-modes, tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-handle-file-regular-p)
(tramp-handle-file-remote-p, tramp-handle-file-symlink-p)
(tramp-handle-find-backup-file-name)
(tramp-handle-insert-file-contents, tramp-handle-load)
(tramp-handle-substitute-in-file-name)
(tramp-handle-unhandled-file-name-directory)
(tramp-mode-string-to-int, tramp-local-host-p)
(tramp-make-tramp-temp-file): Moved from tramp-sh.el.
* net/tramp-gvfs.el (top):
* net/tramp-smb.el (top): Do not require 'tramp-sh.
* net/tramp-sh.el (all): Move several objects to tramp.el, see
there. Rename `tramp-handle-*' to `tramp-sh-handle-*'.
Diffstat (limited to 'lisp/net/tramp-gvfs.el')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 151e03e88ab..0d9bd36cc05 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -104,10 +104,6 @@ (require 'tramp) -;; We call several `tramp-handle-*' functions directly. So we must -;; reqire that package as well. -(require 'tramp-sh) - (require 'dbus) (require 'url-parse) (require 'url-util) @@ -405,6 +401,7 @@ Every entry is a list (NAME ADDRESS).") (file-name-directory . tramp-handle-file-name-directory) (file-name-nondirectory . tramp-handle-file-name-nondirectory) ;; `file-name-sans-versions' performed by default handler. + ;; CCC: Must be checked! (file-newer-than-file-p . tramp-handle-file-newer-than-file-p) (file-ownership-preserved-p . ignore) (file-readable-p . tramp-gvfs-handle-file-readable-p) |