Mercurial > emacs
comparison lisp/Makefile.in @ 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 | ce960720ed3f |
| children | 4b26adbef9a2 |
comparison
equal
deleted
inserted
replaced
| 110263:280c5216180d | 110264:ec526909f60b |
|---|---|
| 54 # build; ie it does not need to include things created via | 54 # build; ie it does not need to include things created via |
| 55 # generated-autoload-file (eg calc/calc-loaddefs.el). | 55 # generated-autoload-file (eg calc/calc-loaddefs.el). |
| 56 LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ | 56 LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ |
| 57 $(lisp)/calendar/diary-loaddefs.el \ | 57 $(lisp)/calendar/diary-loaddefs.el \ |
| 58 $(lisp)/calendar/hol-loaddefs.el \ | 58 $(lisp)/calendar/hol-loaddefs.el \ |
| 59 $(lisp)/mh-e/mh-loaddefs.el | 59 $(lisp)/mh-e/mh-loaddefs.el \ |
| 60 $(lisp)/net/tramp-loaddefs.el | |
| 60 | 61 |
| 61 # Elisp files auto-generated. | 62 # Elisp files auto-generated. |
| 62 AUTOGENEL = loaddefs.el \ | 63 AUTOGENEL = loaddefs.el \ |
| 63 $(LOADDEFS) \ | 64 $(LOADDEFS) \ |
| 64 cus-load.el \ | 65 cus-load.el \ |
| 327 --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ | 328 --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ |
| 328 --eval "(setq generated-autoload-file \"$@\")" \ | 329 --eval "(setq generated-autoload-file \"$@\")" \ |
| 329 --eval "(setq make-backup-files nil)" \ | 330 --eval "(setq make-backup-files nil)" \ |
| 330 -f batch-update-autoloads $(MH_E_DIR) | 331 -f batch-update-autoloads $(MH_E_DIR) |
| 331 | 332 |
| 333 # Update TRAMP internal autoloads. Maybe we could move trmp*.el into | |
| 334 # an own subdirectory. OTOH, it does not hurt to keep them in | |
| 335 # lisp/net. | |
| 336 TRAMP_DIR = $(lisp)/net | |
| 337 TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-cache.el \ | |
| 338 $(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \ | |
| 339 $(TRAMP_DIR)/tramp-fish.el $(TRAMP_DIR)/tramp-ftp.el \ | |
| 340 $(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \ | |
| 341 $(TRAMP_DIR)/tramp-imap.el $(TRAMP_DIR)/tramp-smb.el \ | |
| 342 $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el | |
| 343 | |
| 344 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) | |
| 345 $(emacs) -l autoload \ | |
| 346 --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ | |
| 347 --eval "(setq generated-autoload-file \"$@\")" \ | |
| 348 --eval "(setq make-backup-files nil)" \ | |
| 349 -f batch-update-autoloads $(TRAMP_DIR) | |
| 350 | |
| 332 CAL_DIR = $(lisp)/calendar | 351 CAL_DIR = $(lisp)/calendar |
| 333 ## Those files that may contain internal calendar autoload cookies. | 352 ## Those files that may contain internal calendar autoload cookies. |
| 334 ## Avoids circular dependency warning for *-loaddefs.el. | 353 ## Avoids circular dependency warning for *-loaddefs.el. |
| 335 CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \ | 354 CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \ |
| 336 $(CAL_DIR)/cal-coptic.el $(CAL_DIR)/cal-dst.el \ | 355 $(CAL_DIR)/cal-coptic.el $(CAL_DIR)/cal-dst.el \ |