comparison lisp/net/tramp-cmds.el @ 110264:ec526909f60b

Migrate to Tramp 2.2. Rearrange load dependencies. (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.
author Michael Albinus <michael.albinus@gmx.de>
date Wed, 08 Sep 2010 16:42:54 +0200
parents 280c8ae2476d
children ba4844f77a64
comparison
equal deleted inserted replaced
110263:280c5216180d 110264:ec526909f60b
127 (dolist (name (tramp-list-remote-buffers)) 127 (dolist (name (tramp-list-remote-buffers))
128 (when (bufferp (get-buffer name)) (kill-buffer name)))) 128 (when (bufferp (get-buffer name)) (kill-buffer name))))
129 129
130 ;; Tramp version is useful in a number of situations. 130 ;; Tramp version is useful in a number of situations.
131 131
132 ;;;###tramp-autoload
132 (defun tramp-version (arg) 133 (defun tramp-version (arg)
133 "Print version number of tramp.el in minibuffer or current buffer." 134 "Print version number of tramp.el in minibuffer or current buffer."
134 (interactive "P") 135 (interactive "P")
135 (if arg (insert tramp-version) (message tramp-version))) 136 (if arg (insert tramp-version) (message tramp-version)))
136 137
385 (kill-buffer nil) 386 (kill-buffer nil)
386 (throw 'dont-send nil)))))) 387 (throw 'dont-send nil))))))
387 388
388 (defalias 'tramp-submit-bug 'tramp-bug) 389 (defalias 'tramp-submit-bug 'tramp-bug)
389 390
391 (add-hook 'tramp-unload-hook
392 (lambda () (unload-feature 'tramp-cmds 'force)))
393
390 (provide 'tramp-cmds) 394 (provide 'tramp-cmds)
391 395
392 ;;; TODO: 396 ;;; TODO:
393 397
394 ;; * Clean up unused *tramp/foo* buffers after a while. (Pete Forman) 398 ;; * Clean up unused *tramp/foo* buffers after a while. (Pete Forman)
395 ;; * WIBNI there was an interactive command prompting for Tramp 399 ;; * WIBNI there was an interactive command prompting for Tramp
396 ;; method, hostname, username and filename and translates the user 400 ;; method, hostname, username and filename and translates the user
397 ;; input into the correct filename syntax (depending on the Emacs 401 ;; input into the correct filename syntax (depending on the Emacs
398 ;; flavor) (Reiner Steib) 402 ;; flavor) (Reiner Steib)
399 ;; * Let the user edit the connection properties interactively. 403 ;; * Let the user edit the connection properties interactively.
400 ;; Something like `gnus-server-edit-server' in Gnus' *Server* buffer. 404 ;; Something like `gnus-server-edit-server' in Gnus' *Server* buffer.
401 ;; * It's just that when I come to Customize `tramp-default-user-alist' 405 ;; * It's just that when I come to Customize `tramp-default-user-alist'
402 ;; I'm presented with a mismatch and raw lisp for a value. It is my 406 ;; I'm presented with a mismatch and raw lisp for a value. It is my
403 ;; understanding that a variable declared with defcustom is a User 407 ;; understanding that a variable declared with defcustom is a User
404 ;; Option and should not be modified by the code. add-to-list is 408 ;; Option and should not be modified by the code. add-to-list is
405 ;; called in several places. One way to handle that is to have a new 409 ;; called in several places. One way to handle that is to have a new
406 ;; ordinary variable that gets its initial value from 410 ;; ordinary variable that gets its initial value from
407 ;; tramp-default-user-alist and then is added to. (Pete Forman) 411 ;; tramp-default-user-alist and then is added to. (Pete Forman)
408 412
409 ;; arch-tag: 190d4c33-76bb-4e99-8b6f-71741f23d98c 413 ;; arch-tag: 190d4c33-76bb-4e99-8b6f-71741f23d98c
410 ;;; tramp-cmds.el ends here 414 ;;; tramp-cmds.el ends here