• Michael Albinus's avatar
    Migrate to Tramp 2.2. Rearrange load dependencies. · 0f34aa77
    Michael Albinus authored
    (Bug#1529, Bug#5448, Bug#5705)
    
    * Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
    ($(TRAMP_DIR)/tramp-loaddefs.el): New target.
    (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
    
    * net/tramp.el (top): Remove all other tramp-* loads except
    tramp-compat.el.  Remove all changes to tramp-unload-hook for
    other tramp-* packages.  Rearrange defun order.  Change calls of
    `tramp-compat-call-process', `tramp-compat-decimal-to-octal',
    `tramp-compat-octal-to-decimal' to new function names.
    (tramp-terminal-type, tramp-initial-end-of-output)
    (tramp-methods, tramp-foreign-file-name-handler-alist)
    (tramp-tramp-file-p, tramp-completion-mode-p)
    (tramp-send-command-and-check, tramp-get-remote-path)
    (tramp-get-remote-tmpdir, tramp-get-remote-ln)
    (tramp-shell-quote-argument): Set tramp-autoload cookie.
    (with-file-property, with-connection-property): Move to
    tramp-cache.el.
    (tramp-local-call-process, tramp-decimal-to-octal)
    (tramp-octal-to-decimal): Move to tramp-compat.el.
    (tramp-handle-shell-command): Do not require 'shell.
    (tramp-compute-multi-hops): No special handling for tramp-gw-*
    symbols.
    (tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
    
    * net/tramp-cache.el (top): Require 'tramp.  Add to
    `tramp-unload-hook'.
    (tramp-cache-data, tramp-get-file-property)
    (tramp-set-file-property, tramp-flush-file-property)
    (tramp-flush-directory-property, tramp-get-connection-property)
    (tramp-set-connection-property, tramp-flush-connection-property)
    (tramp-cache-print, tramp-list-connections): Set tramp-autoload
    cookie.
    (with-file-property, with-connection-property): New defuns, moved
    from tramp.el.
    (tramp-flush-file-function): Use `with-parsed-tramp-file-name'
    macro.
    
    * net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
    (tramp-version): Set tramp-autoload cookie.
    
    * net/tramp-compat.el (top): Require 'tramp-loaddefs.  Remove all
    changes to tramp-unload-hook for other tramp-* packages.  Add to
    `tramp-unload-hook'.
    (tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
    (tramp-compat-call-process): New defuns, moved from tramp.el.
    
    * net/tramp-fish.el (top) Require just 'tramp.  Add objects to
    `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
    to `tramp-unload-hook'.  Change call of
    `tramp-compat-decimal-to-octal' to new function name.
    (tramp-fish-method): Make it a defconst.
    (tramp-fish-file-name-p): Make it a defsubst.
    (tramp-fish-method, tramp-fish-file-name-handler)
    (tramp-fish-file-name-p): Set tramp-autoload cookie.
    
    * net/tramp-ftp.el (top) Add objects to `tramp-methods' and
    `tramp-foreign-file-name-handler-alist'.  Add to
    `tramp-unload-hook'.
    (tramp-ftp-method): Make it a defconst.
    (tramp-ftp-file-name-p): Make it a defsubst.
    (tramp-ftp-method, tramp-ftp-file-name-handler)
    (tramp-ftp-file-name-p): Set tramp-autoload cookie.
    
    * net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
    `tramp-foreign-file-name-handler-alist'.  Add to
    `tramp-unload-hook'.  Change checks, whether package can be
    loaded.
    (tramp-gvfs-file-name-p): Make it a defsubst.
    (tramp-gvfs-methods, tramp-gvfs-file-name-handler)
    (tramp-gvfs-file-name-p): Set tramp-autoload cookie.
    (tramp-gvfs-handle-file-directory-p): New defun.
    (tramp-gvfs-file-name-handler-alist): Use it.
    
    * net/tramp-gw.el (top) Add objects to `tramp-methods' and
    `tramp-foreign-file-name-handler-alist'.  Add to
    `tramp-unload-hook'.
    (tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
    (tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
    defconst.
    (tramp-gw-tunnel-method, tramp-gw-socks-method)
    (tramp-gw-open-connection): Set tramp-autoload cookie.
    
    * net/tramp-imap.el (top) Require just 'tramp.  Add objects to
    `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
    to `tramp-unload-hook'.  Change checks, whether package can be
    loaded.
    (tramp-imap-file-name-p): Make it a defsubst.
    (tramp-imap-method, tramp-imaps-method)
    (tramp-imap-file-name-handler)
    (tramp-imap-file-name-p): Set tramp-autoload cookie.
    
    * net/tramp-smb.el (top) Require just 'tramp.  Add objects to
    `tramp-methods' and `tramp-foreign-file-name-handler-alist'.  Add
    to `tramp-unload-hook'.  Change checks, whether package can be
    loaded.  Change call of `tramp-compat-decimal-to-octal' to new
    function name.
    (tramp-smb-tunnel-method): Make it a defconst.
    (tramp-smb-file-name-p): Make it a defsubst.
    (tramp-smb-method, tramp-smb-file-name-handler)
    (tramp-smb-file-name-p): Set tramp-autoload cookie.
    
    * net/tramp-uu.el (top) Add to `tramp-unload-hook'.
    (tramp-uuencode-region): Set tramp-autoload cookie.
    
    * net/trampver.el (top) Add to `tramp-unload-hook'.
    (tramp-version, tramp-bug-report-address): Set tramp-autoload
    cookie.  Update release number.
    0f34aa77
tramp-smb.el 51 KB