commit/tramp: 3 new changesets

3 new commits in tramp: https://bitbucket.org/xemacs/tramp/commits/d08726f1690a/ changeset: d08726f1690a user: albinus date: 2013-01-29 14:33:56 summary: * Makefile (LISPFILES): New variable. (ELCS): Derive from $(LISPFILES). Add lisp/tramp-loaddefs.elc. (EXTRA_SOURCES): Remove lisp/tramp-loaddefs.el. (lisp/tramp-loaddefs.el): New target. affected #: 2 files diff -r 1139b513b590b4532982538c4f3f03ee275496e6 -r d08726f1690a67712535fcd= 162fcfff2e467891d ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,10 ＠＠ +2013-01-29 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * Makefile (LISPFILES): New variable. + (ELCS): Derive from $(LISPFILES). Add lisp/tramp-loaddefs.elc. + (EXTRA_SOURCES): Remove lisp/tramp-loaddefs.el. + (lisp/tramp-loaddefs.el): New target. + 2013-01-28 Michael Albinus <michael.albinus(a)gmx.de&gt; =20 * Makefile (EXTRA_SOURCES): Add lisp/tramp-loaddefs.el. diff -r 1139b513b590b4532982538c4f3f03ee275496e6 -r d08726f1690a67712535fcd= 162fcfff2e467891d Makefile --- a/Makefile +++ b/Makefile ＠＠ -27,11 +27,13 ＠＠ =20 include ../../Local.rules.inc =20 -ELCS =3D lisp/tramp.elc lisp/tramp-adb.elc lisp/tramp-cache.elc \ - lisp/tramp-cmds.elc lisp/tramp-compat.elc lisp/tramp-efs.elc \ - lisp/tramp-sh.elc lisp/tramp-smb.elc lisp/tramp-uu.elc lisp/trampver.elc +LISPFILES =3D lisp/tramp.el lisp/tramp-adb.el lisp/tramp-cache.el \ + lisp/tramp-cmds.el lisp/tramp-compat.el lisp/tramp-efs.el \ + lisp/tramp-sh.el lisp/tramp-smb.el lisp/tramp-uu.el lisp/trampver.el =20 -EXTRA_SOURCES =3D ChangeLog.upstream lisp/tramp-loaddefs.el +ELCS =3D $(LISPFILES:.el=3D.elc) lisp/tramp-loaddefs.elc + +EXTRA_SOURCES =3D ChangeLog.upstream =20 EXPLICIT_DOCS =3D texi/$(PACKAGE).texi MAKEINFO_FLAGS =3D --footnote-style=3Dend -D xemacs ＠＠ -47,3 +49,9 ＠＠ AUTOLOAD_PATH =3D lisp =20 include ../../XEmacs.rules + +lisp/tramp-loaddefs.el: $(LISPFILES) + make EMACS_GVFS=3Dno EMACS_GW=3Dno EMACS_INFO=3Dxemacs \ + EMACS=3D$(XEMACS_BINARY) \ + builddir=3D$(XEMACS_PACKAGES_BASE)/xemacs-packages/tramp/lisp \ + -C lisp autoloads https://bitbucket.org/xemacs/tramp/commits/940dd66c22eb/ changeset: 940dd66c22eb user: albinus date: 2013-01-29 14:38:19 summary: * lisp/Makefile: Add from upstream. * lisp/tramp-loaddefs.el: Remove from repository. It is generated now. affected #: 3 files diff -r d08726f1690a67712535fcd162fcfff2e467891d -r 940dd66c22eb41fa9c95167= 09e8eaecc0ae4b9de ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -5,6 +5,11 ＠＠ (EXTRA_SOURCES): Remove lisp/tramp-loaddefs.el. (lisp/tramp-loaddefs.el): New target. =20 + * lisp/Makefile: Add from upstream. + + * lisp/tramp-loaddefs.el: Remove from repository. It is generated + now. + 2013-01-28 Michael Albinus <michael.albinus(a)gmx.de&gt; =20 * Makefile (EXTRA_SOURCES): Add lisp/tramp-loaddefs.el. diff -r d08726f1690a67712535fcd162fcfff2e467891d -r 940dd66c22eb41fa9c95167= 09e8eaecc0ae4b9de lisp/Makefile --- /dev/null +++ b/lisp/Makefile ＠＠ -0,0 +1,125 ＠＠ +# -*- coding: utf-8; -*- +# Emacs Makefile for TRAMP +# lisp/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1998-2013 Free Software Foundation, Inc. + +# Author: Kai Gro=C3=9Fjohann <kai.grossjohann(a)gmx.net&gt; +# Michael Albinus <michael.albinus(a)gmx.de&gt; +# Keywords: comm, processes + +# This file is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>;. + +# This Makefile requires GNU make. + +EMACS =3D emacs +EMACS_GVFS =3D yes +EMACS_GW =3D yes +EMACS_INFO =3D emacs +INSTALL =3D install -m644 +MKDIR =3D ＠mkdir -p +RM =3D -rm -f + +builddir =3D /home/albinus/src/tramp/lisp +prefix =3D /usr/local +datarootdir =3D ${prefix}/share +datadir =3D ${datarootdir} +lispdir =3D ${datadir}/emacs/site-lisp +DESTDIR =3D + +CONTRIB_FILES =3D=20 +CLEAN_FILES =3D .\\\#* \\\#* .*~ *~ *.aux *.cp *.cps *.diff *.dvi *.elc *.= fn *.fns *.html *.info *.ky *.log *.pg *.tmp *.toc *.tp *.vr *.vrs + +# trampver.el and tramp.el must be handled first due to dependencies. +LISP_FILES =3D trampver.el tramp.el tramp-adb.el tramp-cache.el \ + tramp-cmds.el tramp-compat.el tramp-sh.el \ + tramp-smb.el tramp-uu.el + +# tramp-gvfs.el needs Emacs 23 at least. +ifeq ($(EMACS_GVFS), yes) + LISP_FILES +=3D tramp-gvfs.el +endif + +# tramp-gw.el needs Emacs 22 at least. +ifeq ($(EMACS_GW), yes) + LISP_FILES +=3D tramp-gw.el +endif + +# tramp-ftp.el and tramp-efs.el are useful for Emacs resp XEmacs only. +ifeq ($(EMACS_INFO), emacs) + LISP_FILES +=3D tramp-ftp.el +else + LISP_FILES +=3D tramp-efs.el +endif + +INSTALL_FILES =3D $(LISP_FILES) $(CONTRIB_FILES) tramp-loaddefs.el \ + $(addsuffix .elc, $(basename $(LISP_FILES) $(CONTRIB_FILES))) + +ifeq ($(EMACS_INFO), emacs) + EM =3D $(EMACS) --no-site-file -batch +else + EM =3D $(EMACS) -no-autoloads -batch -l cl-macs +endif + + +.PHONY: all autoloads install clean distclean tramp xemacs + +.SUFFIXES: .elc .el + +all: autoloads $(addsuffix .elc, $(basename $(LISP_FILES) $(CONTRIB_FILES)= )) + +autoloads: $(builddir)/tramp-loaddefs.el +$(builddir)/tramp-loaddefs.el: $(LISP_FILES) +# XEmacs must be advised to put tramp.el definitions at the beginning. +# We redefine `autoload-trim-file-name', therefore. + $(EM) -l autoload \ + --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ + --eval "(setq generated-autoload-file \ + (expand-file-name \"tramp-loaddefs.el\"))" \ + --eval "(setq make-backup-files nil)" \ + --eval "(unless (string-equal \"$(EMACS_INFO)\" \"emacs\") \ + (defalias 'autoload-trim-file-name \ + 'file-name-sans-extension))" \ + -f batch-update-autoloads . +# XEmacs uses hard coded feature `lisp-autoloads'. + ＠sed -e s/lisp-autoloads/tramp-loaddefs/g $＠ >$＠.$$$$ && \ + mv -f $＠.$$$$ $＠ +# Emacs 22 does not add the `provide' form to the generated loaddefs.el. + ＠grep -q provide $＠ || echo "(provide 'tramp-loaddefs)" >>$＠ + +%.elc: %.el + $(EM) -l bytecomp \ + --eval "(add-to-list 'load-path default-directory)" \ + -f batch-byte-compile $? + +install: all + $(MKDIR) $(DESTDIR)$(lispdir) + $(INSTALL) $(INSTALL_FILES) $(DESTDIR)$(lispdir) + +clean: + $(RM) $(CLEAN_FILES) + +distclean: clean + $(RM) $(CONTRIB_FILES) tramp-loaddefs.el + +# Maintainer targets. + +tramp: all + +xemacs: + cp $(LISP_FILES) tramp-loaddefs.el ChangeLog $(XEMACS_TARGET)/lisp + +### TODO: + +## * Update Tramp's autoladed symbols in loaddefs.el during install. diff -r d08726f1690a67712535fcd162fcfff2e467891d -r 940dd66c22eb41fa9c95167= 09e8eaecc0ae4b9de lisp/tramp-loaddefs.el --- a/lisp/tramp-loaddefs.el +++ /dev/null ＠＠ -1,633 +0,0 ＠＠ -;;; DO NOT MODIFY THIS FILE -(if (featurep 'tramp-loaddefs) (error "Feature tramp-loaddefs already load= ed")) -=0C -;;;### (autoloads (tramp-shell-quote-argument tramp-time-diff tramp-time-l= ess-p tramp-clear-passwd tramp-read-passwd tramp-make-tramp-temp-file tramp= -local-host-p tramp-mode-string-to-int tramp-parse-putty tramp-parse-netrc = tramp-parse-passwd tramp-parse-hosts tramp-parse-sknownhosts tramp-parse-sh= ostkeys tramp-parse-sconfig tramp-parse-shosts tramp-parse-rhosts tramp-com= pletion-mode-p tramp-set-completion-function tramp-tramp-file-p tramp-defau= lt-host-alist tramp-default-user-alist tramp-default-method-alist) "tramp" = "/net/ford/albinus/src/tramp/lisp/tramp") - -(defvar tramp-methods nil "\ -Alist of methods for remote files. -This is a list of entries of the form (NAME PARAM1 PARAM2 ...). -Each NAME stands for a remote access method. Each PARAM is a -pair of the form (KEY VALUE). The following KEYs are defined: - * `tramp-remote-shell' - This specifies the shell to use on the remote host. This - MUST be a Bourne-like shell. It is normally not necessary to - set this to any value other than \"/bin/sh\": Tramp wants to - use a shell which groks tilde expansion, but it can search - for it. Also note that \"/bin/sh\" exists on all Unixen, - this might not be true for the value that you decide to use. - You Have Been Warned. - * `tramp-remote-shell-args' - For implementation of `shell-command', this specifies the - arguments to let `tramp-remote-shell' run a single command. - * `tramp-login-program' - This specifies the name of the program to use for logging in to the - remote host. This may be the name of rsh or a workalike program, - or the name of telnet or a workalike, or the name of su or a workalike. - * `tramp-login-args' - This specifies the list of arguments to pass to the above - mentioned program. Please note that this is a list of list of argumen= ts, - that is, normally you don't want to put \"-a -b\" or \"-f foo\" - here. Instead, you want a list (\"-a\" \"-b\"), or (\"-f\" \"foo\"). - There are some patterns: \"%h\" in this list is replaced by the host - name, \"%u\" is replaced by the user name, \"%p\" is replaced by the - port number, and \"%%\" can be used to obtain a literal percent charac= ter. - If a list containing \"%h\", \"%u\" or \"%p\" is unchanged during - expansion (i.e. no host or no user specified), this list is not used as - argument. By this, arguments like (\"-l\" \"%u\") are optional. - \"%t\" is replaced by the temporary file name produced with - `tramp-make-tramp-temp-file'. \"%k\" indicates the keep-date - parameter of a program, if exists. - * `tramp-async-args' - When an asynchronous process is started, we know already that - the connection works. Therefore, we can pass additional - parameters to suppress diagnostic messages, in order not to - tamper the process output. - * `tramp-copy-program' - This specifies the name of the program to use for remotely copying - the file; this might be the absolute filename of rcp or the name of - a workalike program. - * `tramp-copy-args' - This specifies the list of parameters to pass to the above mentioned - program, the hints for `tramp-login-args' also apply here. - * `tramp-copy-keep-date' - This specifies whether the copying program when the preserves the - timestamp of the original file. - * `tramp-copy-keep-tmpfile' - This specifies whether a temporary local file shall be kept - for optimization reasons (useful for \"rsync\" methods). - * `tramp-copy-recursive' - Whether the operation copies directories recursively. - * `tramp-default-port' - The default port of a method is needed in case of gateway connections. - Additionally, it is used as indication which method is prepared for - passing gateways. - * `tramp-gw-args' - As the attribute name says, additional arguments are specified here - when a method is applied via a gateway. - * `tramp-tmpdir' - A directory on the remote host for temporary files. If not - specified, \"/tmp\" is taken as default. - -What does all this mean? Well, you should specify `tramp-login-program' -for all methods; this program is used to log in to the remote site. Then, -there are two ways to actually transfer the files between the local and the -remote side. One way is using an additional rcp-like program. If you want -to do this, set `tramp-copy-program' in the method. - -Another possibility for file transfer is inline transfer, i.e. the -file is passed through the same buffer used by `tramp-login-program'. In -this case, the file contents need to be protected since the -`tramp-login-program' might use escape codes or the connection might not -be eight-bit clean. Therefore, file contents are encoded for transit. -See the variables `tramp-local-coding-commands' and -`tramp-remote-coding-commands' for details. - -So, to summarize: if the method is an out-of-band method, then you -must specify `tramp-copy-program' and `tramp-copy-args'. If it is an -inline method, then these two parameters should be nil. Methods which -are fit for gateways must have `tramp-default-port' at least. - -Notes: - -When using `su' or `sudo' the phrase `open connection to a remote -host' sounds strange, but it is used nevertheless, for consistency. -No connection is opened to a remote host, but `su' or `sudo' is -started on the local host. You should specify a remote host -`localhost' or the name of the local host. Another host name is -useful only in combination with `tramp-default-proxies-alist'.") - -(defvar tramp-default-method-alist nil "\ -Default method to use for specific host/user pairs. -This is an alist of items (HOST USER METHOD). The first matching item -specifies the method to use for a file name which does not specify a -method. HOST and USER are regular expressions or nil, which is -interpreted as a regular expression which always matches. If no entry -matches, the variable `tramp-default-method' takes effect. - -If the file name does not specify the user, lookup is done using the -empty string for the user name. - -See `tramp-methods' for a list of possibilities for METHOD.") - -(defvar tramp-default-user-alist nil "\ -Default user to use for specific method/host pairs. -This is an alist of items (METHOD HOST USER). The first matching item -specifies the user to use for a file name which does not specify a -user. METHOD and USER are regular expressions or nil, which is -interpreted as a regular expression which always matches. If no entry -matches, the variable `tramp-default-user' takes effect. - -If the file name does not specify the method, lookup is done using the -empty string for the method name.") - -(defvar tramp-default-host-alist nil "\ -Default host to use for specific method/user pairs. -This is an alist of items (METHOD USER HOST). The first matching item -specifies the host to use for a file name which does not specify a -host. METHOD and HOST are regular expressions or nil, which is -interpreted as a regular expression which always matches. If no entry -matches, the variable `tramp-default-host' takes effect. - -If the file name does not specify the method, lookup is done using the -empty string for the method name.") - -(defconst tramp-local-host-regexp (concat "\\`" (regexp-opt (list "localho= st" "localhost6" (system-name) "127.0.0.1" "::1") t) "\\'") "\ -Host names which are regarded as local host.") - -(defconst tramp-prefix-domain-format "%" "\ -String matching delimiter between user and domain names.") - -(defconst tramp-prefix-domain-regexp (regexp-quote tramp-prefix-domain-for= mat) "\ -Regexp matching delimiter between user and domain names. -Derived from `tramp-prefix-domain-format'.") - -(defvar tramp-foreign-file-name-handler-alist nil "\ -Alist of elements (FUNCTION . HANDLER) for foreign methods handled special= ly. -If (FUNCTION FILENAME) returns non-nil, then all I/O on that file is done = by -calling HANDLER.") - -(autoload 'tramp-tramp-file-p "tramp" "\ -Return t if NAME is a string with Tramp file name syntax. - -arguments: (NAME) -" nil nil) - -(autoload 'tramp-set-completion-function "tramp" "\ -Sets the list of completion functions for METHOD. -FUNCTION-LIST is a list of entries of the form (FUNCTION FILE). -The FUNCTION is intended to parse FILE according its syntax. -It might be a predefined FUNCTION, or a user defined FUNCTION. -For the list of predefined FUNCTIONs see `tramp-completion-function-alist'. - -Example: - - (tramp-set-completion-function - \"ssh\" - '((tramp-parse-sconfig \"/etc/ssh_config\") - (tramp-parse-sconfig \"~/.ssh/config\"))) - -arguments: (METHOD FUNCTION-LIST) -" nil nil) - -(autoload 'tramp-completion-mode-p "tramp" "\ -Check, whether method / user name / host name completion is active. - -arguments: () -" nil nil) - -(autoload 'tramp-parse-rhosts "tramp" "\ -Return a list of (user host) tuples allowed to access. -Either user or host may be nil. - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-shosts "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-sconfig "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-shostkeys "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (DIRNAME) -" nil nil) - -(autoload 'tramp-parse-sknownhosts "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (DIRNAME) -" nil nil) - -(autoload 'tramp-parse-hosts "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-passwd "tramp" "\ -Return a list of (user host) tuples allowed to access. -Host is always \"localhost\". - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-netrc "tramp" "\ -Return a list of (user host) tuples allowed to access. -User may be nil. - -arguments: (FILENAME) -" nil nil) - -(autoload 'tramp-parse-putty "tramp" "\ -Return a list of (user host) tuples allowed to access. -User is always nil. - -arguments: (REGISTRY-OR-DIRNAME) -" nil nil) - -(autoload 'tramp-mode-string-to-int "tramp" "\ -Converts a ten-letter `drwxrwxrwx'-style mode string into mode bits. - -arguments: (MODE-STRING) -" nil nil) - -(autoload 'tramp-local-host-p "tramp" "\ -Return t if this points to the local host, nil otherwise. - -arguments: (VEC) -" nil nil) - -(autoload 'tramp-make-tramp-temp-file "tramp" "\ -Create a temporary file on the remote host identified by VEC. -Return the local name of the temporary file. - -arguments: (VEC) -" nil nil) - -(autoload 'tramp-read-passwd "tramp" "\ -Read a password from user (compat function). -Consults the auth-source package. -Invokes `password-read' if available, `read-passwd' else. - -arguments: (PROC &optional PROMPT) -" nil nil) - -(autoload 'tramp-clear-passwd "tramp" "\ -Clear password cache for connection related to VEC. - -arguments: (VEC) -" nil nil) - -(autoload 'tramp-time-less-p "tramp" "\ -Say whether time value T1 is less than time value T2. - -arguments: (T1 T2) -" nil nil) - -(autoload 'tramp-time-diff "tramp" "\ -Return the difference between the two times, in seconds. -T1 and T2 are time values (as returned by `current-time' for example). - -arguments: (T1 T2) -" nil nil) - -(autoload 'tramp-shell-quote-argument "tramp" "\ -Similar to `shell-quote-argument', but groks newlines. -Only works for Bourne-like shells. - -arguments: (S) -" nil nil) - -;;;*** -=0C -;;;### (autoloads (tramp-adb-parse-device-names tramp-adb-file-name-handle= r) "tramp-adb" "/net/ford/albinus/src/tramp/lisp/tramp-adb") - -(defconst tramp-adb-method "adb" "\ -*When this method name is used, forward all calls to Android Debug Bridge.= ") - -(add-to-list 'tramp-methods (backquote ((\, tramp-adb-method) (tramp-tmpdi= r "/data/local/tmp")))) - -(add-to-list 'tramp-default-host-alist (backquote ((\, tramp-adb-method) n= il ""))) - -(eval-after-load 'tramp '(tramp-set-completion-function tramp-adb-method '= ((tramp-adb-parse-device-names "")))) - -(add-to-list 'tramp-foreign-file-name-handler-alist (cons 'tramp-adb-file-= name-p 'tramp-adb-file-name-handler)) - -(defsubst tramp-adb-file-name-p (filename) "\ -Check if it's a filename for ADB." (let ((v (tramp-dissect-file-name filen= ame))) (string=3D (tramp-file-name-method v) tramp-adb-method))) - -(autoload 'tramp-adb-file-name-handler "tramp-adb" "\ -Invoke the ADB handler for OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -(autoload 'tramp-adb-parse-device-names "tramp-adb" "\ -Return a list of (nil host) tuples allowed to access. - -arguments: (IGNORE) -" nil nil) - -;;;*** -=0C -;;;### (autoloads (tramp-parse-connection-properties tramp-list-connection= s tramp-cache-print tramp-flush-connection-property tramp-set-connection-pr= operty tramp-get-connection-property tramp-flush-directory-property tramp-f= lush-file-property tramp-set-file-property tramp-get-file-property) "tramp-= cache" "/net/ford/albinus/src/tramp/lisp/tramp-cache") - -(defvar tramp-cache-data (make-hash-table :test 'equal) "\ -Hash table for remote files properties.") - -(autoload 'tramp-get-file-property "tramp-cache" "\ -Get the PROPERTY of FILE from the cache context of VEC. -Returns DEFAULT if not set. - -arguments: (VEC FILE PROPERTY DEFAULT) -" nil nil) - -(autoload 'tramp-set-file-property "tramp-cache" "\ -Set the PROPERTY of FILE to VALUE, in the cache context of VEC. -Returns VALUE. - -arguments: (VEC FILE PROPERTY VALUE) -" nil nil) - -(autoload 'tramp-flush-file-property "tramp-cache" "\ -Remove all properties of FILE in the cache context of VEC. - -arguments: (VEC FILE) -" nil nil) - -(autoload 'tramp-flush-directory-property "tramp-cache" "\ -Remove all properties of DIRECTORY in the cache context of VEC. -Remove also properties of all files in subdirectories. - -arguments: (VEC DIRECTORY) -" nil nil) - -(autoload 'tramp-get-connection-property "tramp-cache" "\ -Get the named PROPERTY for the connection. -KEY identifies the connection, it is either a process or a vector. -If the value is not set for the connection, returns DEFAULT. - -arguments: (KEY PROPERTY DEFAULT) -" nil nil) - -(autoload 'tramp-set-connection-property "tramp-cache" "\ -Set the named PROPERTY of a connection to VALUE. -KEY identifies the connection, it is either a process or a vector. -PROPERTY is set persistent when KEY is a vector. - -arguments: (KEY PROPERTY VALUE) -" nil nil) - -(autoload 'tramp-flush-connection-property "tramp-cache" "\ -Remove all properties identified by KEY. -KEY identifies the connection, it is either a process or a vector. - -arguments: (KEY) -" nil nil) - -(autoload 'tramp-cache-print "tramp-cache" "\ -Print hash table TABLE. - -arguments: (TABLE) -" nil nil) - -(autoload 'tramp-list-connections "tramp-cache" "\ -Return a list of all known connection vectors according to `tramp-cache'. - -arguments: () -" nil nil) - -(autoload 'tramp-parse-connection-properties "tramp-cache" "\ -Return a list of (user host) tuples allowed to access for METHOD. -This function is added always in `tramp-get-completion-function' -for all methods. Resulting data are derived from connection history. - -arguments: (METHOD) -" nil nil) - -;;;*** -=0C -;;;### (autoloads (tramp-bug tramp-version tramp-cleanup-all-buffers tramp= -cleanup-all-connections tramp-cleanup-this-connection tramp-cleanup-connec= tion) "tramp-cmds" "/net/ford/albinus/src/tramp/lisp/tramp-cmds") - -(autoload 'tramp-cleanup-connection "tramp-cmds" "\ -Flush all connection related objects. -This includes password cache, file cache, connection cache, buffers. -When called interactively, a Tramp connection has to be selected. - -arguments: (VEC) -" t nil) - -(autoload 'tramp-cleanup-this-connection "tramp-cmds" "\ -Flush all connection related objects of the current buffer's connection. - -arguments: () -" t nil) - -(autoload 'tramp-cleanup-all-connections "tramp-cmds" "\ -Flush all Tramp internal objects. -This includes password cache, file cache, connection cache, buffers. - -arguments: () -" t nil) - -(autoload 'tramp-cleanup-all-buffers "tramp-cmds" "\ -Kill all remote buffers. - -arguments: () -" t nil) - -(autoload 'tramp-version "tramp-cmds" "\ -Print version number of tramp.el in minibuffer or current buffer. - -arguments: (ARG) -" t nil) - -(autoload 'tramp-bug "tramp-cmds" "\ -Submit a bug report to the Tramp developers. - -arguments: () -" t nil) - -;;;*** -=0C -;;;### (autoloads (tramp-efs-file-name-handler) "tramp-efs" "/net/ford/alb= inus/src/tramp/lisp/tramp-efs") - -(defconst tramp-efs-method "ftp" "\ -Name of the method invoking EFS.") - -(when (featurep 'xemacs) (add-to-list 'tramp-methods (cons tramp-efs-metho= d nil)) (add-to-list 'tramp-default-method-alist (list "\\`ftp\\." nil tram= p-efs-method)) (add-to-list 'tramp-default-method-alist (list nil "\\`\\(an= onymous\\|ftp\\)\\'" tramp-efs-method))) - -(eval-after-load 'tramp '(tramp-set-completion-function tramp-efs-method '= ((tramp-parse-netrc "~/.netrc")))) - -(autoload 'tramp-efs-file-name-handler "tramp-efs" "\ -Invoke the EFS handler for OPERATION. -First arg specifies the OPERATION, second args is a list of arguments to -pass to the OPERATION. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -(defsubst tramp-efs-file-name-p (filename) "\ -Check if it's a filename that should be forwarded to EFS." (when (string-m= atch (nth 0 tramp-file-name-structure) filename) (string=3D (tramp-file-nam= e-method (tramp-dissect-file-name filename)) tramp-efs-method))) - -(when (featurep 'xemacs) (add-to-list 'tramp-foreign-file-name-handler-ali= st (cons 'tramp-efs-file-name-p 'tramp-efs-file-name-handler))) - -;;;*** -=0C -;;;### (autoloads (tramp-sh-file-name-handler tramp-remote-path tramp-term= inal-type) "tramp-sh" "/net/ford/albinus/src/tramp/lisp/tramp-sh") - -(defvar tramp-terminal-type "dumb" "\ -Value of TERM environment variable for logging in to remote host. -Because Tramp wants to parse the output of the remote shell, it is easily -confused by ANSI color escape sequences and suchlike. Often, shell init -files conditionalize this setup based on the TERM environment variable.") - -(defconst tramp-initial-end-of-output "#$ " "\ -Prompt when establishing a connection.") - -(add-to-list 'tramp-methods '("rcp" (tramp-login-program "rsh") (tramp-log= in-args (("%h") ("-l" "%u"))) (tramp-remote-shell "/bin/sh") (tramp-remote-= shell-args ("-c")) (tramp-copy-program "rcp") (tramp-copy-args (("-p" "%k")= ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t))) - -(add-to-list 'tramp-methods '("remcp" (tramp-login-program "remsh") (tramp= -login-args (("%h") ("-l" "%u"))) (tramp-remote-shell "/bin/sh") (tramp-rem= ote-shell-args ("-c")) (tramp-copy-program "rcp") (tramp-copy-args (("-p" "= %k"))) (tramp-copy-keep-date t))) - -(add-to-list 'tramp-methods '("scp" (tramp-login-program "ssh") (tramp-log= in-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h"))) (tramp-async-args (= ("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (t= ramp-copy-program "scp") (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") (= "-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args ((= "-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "UserKnownHostsFile=3D/dev/n= ull") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-default-port 22))) - -(add-to-list 'tramp-methods '("scp1" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-1") ("-e" "none") ("%h"))) (tramp-asyn= c-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("= -c")) (tramp-copy-program "scp") (tramp-copy-args (("-1") ("-P" "%p") ("-p"= "%k") ("-q") ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (t= ramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "UserKnownHos= tsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-default-p= ort 22))) - -(add-to-list 'tramp-methods '("scp2" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-2") ("-e" "none") ("%h"))) (tramp-asyn= c-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("= -c")) (tramp-copy-program "scp") (tramp-copy-args (("-2") ("-P" "%p") ("-p"= "%k") ("-q") ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) (t= ramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "UserKnownHos= tsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-default-p= ort 22))) - -(add-to-list 'tramp-methods '("scpc" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-o" "ControlPath=3D%t.%%r＠%%h:%%p") ("-= o" "ControlMaster=3Dyes") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))= ) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-co= py-program "scp") (tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r") (= "-o" "ControlPath=3D%t.%%r＠%%h:%%p") ("-o" "ControlMaster=3Dauto"))) (tramp= -copy-keep-date t) (tramp-copy-recursive t) (tramp-gw-args (("-o" "GlobalKn= ownHostsFile=3D/dev/null") ("-o" "UserKnownHostsFile=3D/dev/null") ("-o" "S= trictHostKeyChecking=3Dno"))) (tramp-default-port 22))) - -(add-to-list 'tramp-methods '("scpx" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("-t" "-t") ("%h") ("/bin/s= h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-rem= ote-shell-args ("-c")) (tramp-copy-program "scp") (tramp-copy-args (("-P" "= %p") ("-p" "%k") ("-q") ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recur= sive t) (tramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "Us= erKnownHostsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp= -default-port 22))) - -(add-to-list 'tramp-methods '("sftp" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h"))) (tramp-async-args = (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (= tramp-copy-program "sftp"))) - -(add-to-list 'tramp-methods '("rsync" (tramp-login-program "ssh") (tramp-l= ogin-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h"))) (tramp-async-args= (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) = (tramp-copy-program "rsync") (tramp-copy-args (("-e" "ssh") ("-t" "%k") ("-= r"))) (tramp-copy-keep-date t) (tramp-copy-keep-tmpfile t) (tramp-copy-recu= rsive t))) - -(add-to-list 'tramp-methods (backquote ("rsyncc" (tramp-login-program "ssh= ") (tramp-login-args (("-l" "%u") ("-p" "%p") ("-o" "ControlPath=3D%t.%%r＠%= %h:%%p") ("-o" "ControlMaster=3Dyes") ("-e" "none") ("%h"))) (tramp-async-a= rgs (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c"= )) (tramp-copy-program "rsync") (tramp-copy-args (("-t" "%k") ("-r"))) (tra= mp-copy-env (("RSYNC_RSH") ((\, (concat "ssh" " -o ControlPath=3D%t.%%r＠%%h= :%%p" " -o ControlMaster=3Dauto"))))) (tramp-copy-keep-date t) (tramp-copy-= keep-tmpfile t) (tramp-copy-recursive t)))) - -(add-to-list 'tramp-methods '("rsh" (tramp-login-program "rsh") (tramp-log= in-args (("%h") ("-l" "%u"))) (tramp-remote-shell "/bin/sh") (tramp-remote-= shell-args ("-c")))) - -(add-to-list 'tramp-methods '("remsh" (tramp-login-program "remsh") (tramp= -login-args (("%h") ("-l" "%u"))) (tramp-remote-shell "/bin/sh") (tramp-rem= ote-shell-args ("-c")))) - -(add-to-list 'tramp-methods '("ssh" (tramp-login-program "ssh") (tramp-log= in-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h"))) (tramp-async-args (= ("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (t= ramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "UserKnownHos= tsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-default-p= ort 22))) - -(add-to-list 'tramp-methods '("ssh1" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-1") ("-e" "none") ("%h"))) (tramp-asyn= c-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("= -c")) (tramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "User= KnownHostsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-d= efault-port 22))) - -(add-to-list 'tramp-methods '("ssh2" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-2") ("-e" "none") ("%h"))) (tramp-asyn= c-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("= -c")) (tramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/null") ("-o" "User= KnownHostsFile=3D/dev/null") ("-o" "StrictHostKeyChecking=3Dno"))) (tramp-d= efault-port 22))) - -(add-to-list 'tramp-methods '("sshx" (tramp-login-program "ssh") (tramp-lo= gin-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("-t" "-t") ("%h") ("/bin/s= h"))) (tramp-async-args (("-q"))) (tramp-remote-shell "/bin/sh") (tramp-rem= ote-shell-args ("-c")) (tramp-gw-args (("-o" "GlobalKnownHostsFile=3D/dev/n= ull") ("-o" "UserKnownHostsFile=3D/dev/null") ("-o" "StrictHostKeyChecking= =3Dno"))) (tramp-default-port 22))) - -(add-to-list 'tramp-methods '("telnet" (tramp-login-program "telnet") (tra= mp-login-args (("%h") ("%p"))) (tramp-remote-shell "/bin/sh") (tramp-remote= -shell-args ("-c")) (tramp-default-port 23))) - -(add-to-list 'tramp-methods '("su" (tramp-login-program "su") (tramp-login= -args (("-") ("%u"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell-ar= gs ("-c")))) - -(add-to-list 'tramp-methods '("sudo" (tramp-login-program "sudo") (tramp-l= ogin-args (("-u" "%u") ("-s") ("-H") ("-p" "Password:"))) (tramp-remote-she= ll "/bin/sh") (tramp-remote-shell-args ("-c")))) - -(add-to-list 'tramp-methods '("ksu" (tramp-login-program "ksu") (tramp-log= in-args (("%u") ("-q"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell= -args ("-c")))) - -(add-to-list 'tramp-methods '("krlogin" (tramp-login-program "krlogin") (t= ramp-login-args (("%h") ("-l" "%u") ("-x"))) (tramp-remote-shell "/bin/sh")= (tramp-remote-shell-args ("-c")))) - -(add-to-list 'tramp-methods '("plink" (tramp-login-program "plink") (tramp= -login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h"))) (tramp-remote-shell = "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-default-port 22))) - -(add-to-list 'tramp-methods '("plink1" (tramp-login-program "plink") (tram= p-login-args (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h"))) (tramp-remote-= shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-default-port 22))) - -(add-to-list 'tramp-methods (backquote ("plinkx" (tramp-login-program "pli= nk") (tramp-login-args (("-load") ("%h") ("-t") ((\, (format "env 'TERM=3D%= s' 'PROMPT_COMMAND=3D' 'PS1=3D%s'" tramp-terminal-type tramp-initial-end-of= -output))) ("/bin/sh"))) (tramp-remote-shell "/bin/sh") (tramp-remote-shell= -args ("-c"))))) - -(add-to-list 'tramp-methods '("pscp" (tramp-login-program "plink") (tramp-= login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h"))) (tramp-remote-shell "= /bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "pscp") (tra= mp-copy-args (("-l" "%u") ("-P" "%p") ("-scp") ("-p" "%k") ("-q") ("-r"))) = (tramp-copy-keep-date t) (tramp-copy-recursive t) (tramp-default-port 22))) - -(add-to-list 'tramp-methods '("psftp" (tramp-login-program "plink") (tramp= -login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h"))) (tramp-remote-shell = "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "pscp") (tr= amp-copy-args (("-l" "%u") ("-P" "%p") ("-sftp") ("-p" "%k") ("-q") ("-r"))= ) (tramp-copy-keep-date t) (tramp-copy-recursive t))) - -(add-to-list 'tramp-methods '("fcp" (tramp-login-program "fsh") (tramp-log= in-args (("%h") ("-l" "%u") ("sh" "-i"))) (tramp-remote-shell "/bin/sh") (t= ramp-remote-shell-args ("-i") ("-c")) (tramp-copy-program "fcp") (tramp-cop= y-args (("-p" "%k"))) (tramp-copy-keep-date t))) - -(add-to-list 'tramp-default-method-alist (backquote ((\, tramp-local-host-= regexp) "\\`root\\'" "su"))) - -(add-to-list 'tramp-default-user-alist (backquote ((\, (concat "\\`" (rege= xp-opt '("su" "sudo" "ksu")) "\\'")) nil "root"))) - -(add-to-list 'tramp-default-user-alist (backquote ((\, (concat "\\`" (rege= xp-opt '("rcp" "remcp" "rsh" "telnet" "krlogin" "fcp")) "\\'")) nil (\, (us= er-login-name))))) - -(defconst tramp-completion-function-alist-rsh '((tramp-parse-rhosts "/etc/= hosts.equiv") (tramp-parse-rhosts "~/.rhosts")) "\ -Default list of (FUNCTION FILE) pairs to be examined for rsh methods.") - -(defconst tramp-completion-function-alist-ssh '((tramp-parse-rhosts "/etc/= hosts.equiv") (tramp-parse-rhosts "/etc/shosts.equiv") (tramp-parse-shosts = "/etc/ssh_known_hosts") (tramp-parse-sconfig "/etc/ssh_config") (tramp-pars= e-shostkeys "/etc/ssh2/hostkeys") (tramp-parse-sknownhosts "/etc/ssh2/known= hosts") (tramp-parse-rhosts "~/.rhosts") (tramp-parse-rhosts "~/.shosts") (= tramp-parse-shosts "~/.ssh/known_hosts") (tramp-parse-sconfig "~/.ssh/confi= g") (tramp-parse-shostkeys "~/.ssh2/hostkeys") (tramp-parse-sknownhosts "~/= .ssh2/knownhosts")) "\ -Default list of (FUNCTION FILE) pairs to be examined for ssh methods.") - -(defconst tramp-completion-function-alist-telnet '((tramp-parse-hosts "/et= c/hosts")) "\ -Default list of (FUNCTION FILE) pairs to be examined for telnet methods.") - -(defconst tramp-completion-function-alist-su '((tramp-parse-passwd "/etc/p= asswd")) "\ -Default list of (FUNCTION FILE) pairs to be examined for su methods.") - -(defconst tramp-completion-function-alist-putty (backquote ((tramp-parse-p= utty (\, (if (memq system-type '(windows-nt)) "HKEY_CURRENT_USER\\Software\= \SimonTatham\\PuTTY\\Sessions" "~/.putty/sessions"))))) "\ -Default list of (FUNCTION REGISTRY) pairs to be examined for putty session= s.") - -(eval-after-load 'tramp '(progn (tramp-set-completion-function "rcp" tramp= -completion-function-alist-rsh) (tramp-set-completion-function "remcp" tram= p-completion-function-alist-rsh) (tramp-set-completion-function "scp" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "scp1" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "scp2" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "scpc" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "scpx" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "sftp" tramp= -completion-function-alist-ssh) (tramp-set-completion-function "rsync" tram= p-completion-function-alist-ssh) (tramp-set-completion-function "rsyncc" tr= amp-completion-function-alist-ssh) (tramp-set-completion-function "rsh" tra= mp-completion-function-alist-rsh) (tramp-set-completion-function "remsh" tr= amp-completion-function-alist-rsh) (tramp-set-completion-function "ssh" tra= mp-completion-function-alist-ssh) (tramp-set-completion-function "ssh1" tra= mp-completion-function-alist-ssh) (tramp-set-completion-function "ssh2" tra= mp-completion-function-alist-ssh) (tramp-set-completion-function "ssh1_old"= tramp-completion-function-alist-ssh) (tramp-set-completion-function "ssh2_= old" tramp-completion-function-alist-ssh) (tramp-set-completion-function "s= shx" tramp-completion-function-alist-ssh) (tramp-set-completion-function "t= elnet" tramp-completion-function-alist-telnet) (tramp-set-completion-functi= on "su" tramp-completion-function-alist-su) (tramp-set-completion-function = "sudo" tramp-completion-function-alist-su) (tramp-set-completion-function "= ksu" tramp-completion-function-alist-su) (tramp-set-completion-function "kr= login" tramp-completion-function-alist-rsh) (tramp-set-completion-function = "plink" tramp-completion-function-alist-ssh) (tramp-set-completion-function= "plink1" tramp-completion-function-alist-ssh) (tramp-set-completion-functi= on "plinkx" tramp-completion-function-alist-putty) (tramp-set-completion-fu= nction "pscp" tramp-completion-function-alist-ssh) (tramp-set-completion-fu= nction "fcp" tramp-completion-function-alist-ssh))) - -(defvar tramp-remote-path '(tramp-default-remote-path "/bin" "/usr/bin" "/= sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/f= reeware/bin" "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/cont= rib/bin" "/opt/bin" "/opt/sbin" "/opt/local/bin") "\ -List of directories to search for executables on remote host. -For every remote host, this variable will be set buffer local, -keeping the list of existing directories on that host. - -You can use `~' in this list, but when searching for a shell which groks -tilde expansion, all directory names starting with `~' will be ignored. - -`Default Directories' represent the list of directories given by -the command \"getconf PATH\". It is recommended to use this -entry on top of this list, because these are the default -directories for POSIX compatible commands. On remote hosts which -do not offer the getconf command (like cygwin), the value -\"/bin:/usr/bin\" is used instead of. - -`Private Directories' are the settings of the $PATH environment, -as given in your `~/.profile'.") - -(add-to-list 'tramp-foreign-file-name-handler-alist '(identity . tramp-sh-= file-name-handler) 'append) - -(autoload 'tramp-sh-file-name-handler "tramp-sh" "\ -Invoke remote-shell Tramp file name handler. -Fall back to normal file name handler if no Tramp handler exists. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -;;;*** -=0C -;;;### (autoloads (tramp-smb-file-name-handler) "tramp-smb" "/net/ford/alb= inus/src/tramp/lisp/tramp-smb") - -(defconst tramp-smb-method "smb" "\ -Method to connect SAMBA and M$ SMB servers.") - -(unless (memq system-type '(cygwin windows-nt)) (add-to-list 'tramp-method= s (backquote ((\, tramp-smb-method) (tramp-remote-shell "") (tramp-tmpdir "= /C$/Temp"))))) - -(add-to-list 'tramp-default-method-alist (backquote (nil (\, tramp-prefix-= domain-regexp) (\, tramp-smb-method)))) - -(add-to-list 'tramp-default-user-alist (backquote ((\, (concat "\\`" tramp= -smb-method "\\'")) nil nil))) - -(eval-after-load 'tramp '(tramp-set-completion-function tramp-smb-method '= ((tramp-parse-netrc "~/.netrc")))) - -(defsubst tramp-smb-file-name-p (filename) "\ -Check if it's a filename for SMB servers." (string=3D (tramp-file-name-met= hod (tramp-dissect-file-name filename)) tramp-smb-method)) - -(autoload 'tramp-smb-file-name-handler "tramp-smb" "\ -Invoke the SMB related OPERATION. -First arg specifies the OPERATION, second arg is a list of arguments to -pass to the OPERATION. - -arguments: (OPERATION &rest ARGS) -" nil nil) - -(unless (memq system-type '(cygwin windows-nt)) (add-to-list 'tramp-foreig= n-file-name-handler-alist (cons 'tramp-smb-file-name-p 'tramp-smb-file-name= -handler))) - -;;;*** -=0C -;;;### (autoloads (tramp-uuencode-region) "tramp-uu" "/net/ford/albinus/sr= c/tramp/lisp/tramp-uu") - -(autoload 'tramp-uuencode-region "tramp-uu" "\ -UU-encode the region between BEG and END. - -arguments: (BEG END) -" nil nil) - -;;;*** - -(defconst tramp-version "2.2.7-pre" "\ -This version of Tramp.") - -(defconst tramp-bug-report-address &quot;tramp-devel(a)gnu.org&quot; "\ -Email address to send bug reports to.") -=0C -(provide 'tramp-loaddefs) https://bitbucket.org/xemacs/tramp/commits/a7fa04a0adfc/ changeset: a7fa04a0adfc user: albinus date: 2013-01-29 14:59:28 summary: Sync with Tramp upstream. affected #: 4 files diff -r 940dd66c22eb41fa9c9516709e8eaecc0ae4b9de -r a7fa04a0adfcf99eec9760f= 372f07fc7b784067d lisp/ChangeLog --- a/lisp/ChangeLog +++ b/lisp/ChangeLog ＠＠ -1,3 +1,38 ＠＠ +2013-01-29 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * tramp-sh.el (tramp-sh-handle-start-file-process): Catch + `suppress'. Otherwise, `tramp-run-real-handler' might be called + in `tramp-file-name-handler'. + (tramp-gw-tunnel-method, tramp-gw-socks-method): Declare for + compatibility. + (tramp-compute-multi-hops): Check, whether + `tramp-gw-tunnel-method' and `tramp-gw-socks-method' are non-nil. + +2013-01-25 Michael Albinus <michael.albinus(a)gmx.de&gt; + + Experimental inotify support. + + * tramp.el (tramp-file-name-for-operation): Add `inotify-add-watch'. + + * tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler + for `inotify-add-watch'. + (tramp-sh-handle-inotify-add-watch) + (tramp-sh-inotify-process-filter, tramp-get-remote-inotifywait): + New defuns. + +2013-01-24 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * tramp.el (tramp-tramp-file-p): Check, whether NAME is unibyte. + + * tramp-sh.el (tramp-sh-handle-set-file-acl): Do not suppress + basic attributes. + (tramp-sh-handle-set-file-acl): Improve error checking. + +2013-01-21 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): Mark + descriptive parts with `display' property. + 2013-01-20 Michael Albinus <michael.albinus(a)gmx.de&gt; =20 Improve XEmacs compatibility. diff -r 940dd66c22eb41fa9c9516709e8eaecc0ae4b9de -r a7fa04a0adfcf99eec9760f= 372f07fc7b784067d lisp/tramp-cmds.el --- a/lisp/tramp-cmds.el +++ b/lisp/tramp-cmds.el ＠＠ -186,7 +186,7 ＠＠ =20 'tramp-load-report-modules ; pre-hook 'tramp-append-tramp-buffers ; post-hook - "\ + (propertize "\n" 'display "\ Enter your bug report in this message, including as much detail as you possibly can about the problem, what you did to cause it and what the local and remote machines are. ＠＠ -209,7 +209,7 ＠＠ buffer in your bug report. =20 --bug report follows this line-- -")))) +"))))) =20 (defun tramp-reporter-dump-variable (varsym mailbuf) "Pretty-print the value of the variable in symbol VARSYM." ＠＠ -348,10 +348,10 ＠＠ (kill-buffer nil) (switch-to-buffer curbuf) (goto-char (point-max)) - (insert "\n\ + (insert (propertize "\n" 'display "\n\ This is a special notion of the `gnus/message' package. If you use another mail agent (by copying the contents of this buffer) -please ensure that the buffers are attached to your email.\n\n") +please ensure that the buffers are attached to your email.\n\n")) (dolist (buffer buffer-list) (tramp-compat-funcall 'mml-insert-empty-tag 'part 'type "text/plain" diff -r 940dd66c22eb41fa9c9516709e8eaecc0ae4b9de -r a7fa04a0adfcf99eec9760f= 372f07fc7b784067d lisp/tramp-sh.el --- a/lisp/tramp-sh.el +++ b/lisp/tramp-sh.el ＠＠ -988,7 +988,8 ＠＠ (set-file-selinux-context . tramp-sh-handle-set-file-selinux-context) (file-acl . tramp-sh-handle-file-acl) (set-file-acl . tramp-sh-handle-set-file-acl) - (vc-registered . tramp-sh-handle-vc-registered)) + (vc-registered . tramp-sh-handle-vc-registered) + (inotify-add-watch . tramp-sh-handle-inotify-add-watch)) "Alist of handler functions. Operations not mentioned here will be handled by the normal Emacs function= s.") =20 ＠＠ -1549,7 +1550,7 ＠＠ (when (and (tramp-remote-acl-p v) (tramp-send-command-and-check v (format - "getfacl -acs %s 2>/dev/null" + "getfacl -ac %s 2>/dev/null" (tramp-shell-quote-argument localname)))) (with-current-buffer (tramp-get-connection-buffer v) (goto-char (point-max)) ＠＠ -1560,21 +1561,20 ＠＠ =20 (defun tramp-sh-handle-set-file-acl (filename acl-string) "Like `set-file-acl' for Tramp files." - (with-parsed-tramp-file-name filename nil - (when (tramp-remote-acl-p v) - (condition-case nil - (when (stringp acl-string) - (tramp-set-file-property v localname "file-acl" acl-string) - (dolist (line (split-string acl-string nil t) t) - (unless (tramp-send-command-and-check - v (format - "setfacl -m %s %s" - line (tramp-shell-quote-argument localname))) - (error nil)))) - ;; In case of errors, we return `nil'. - (error - (tramp-set-file-property v localname "file-acl" 'undef) - nil))))) + (with-parsed-tramp-file-name (expand-file-name filename) nil + (if (and (stringp acl-string) (tramp-remote-acl-p v) + (progn + (tramp-send-command + v (format "setfacl --set-file=3D- %s <<'EOF'\n%s\nEOF\n" + (tramp-shell-quote-argument localname) acl-string)) + (tramp-send-command-and-check v nil))) + ;; Success. + (progn + (tramp-set-file-property v localname "file-acl" acl-string) + t) + ;; In case of errors, we return `nil'. + (tramp-set-file-property v localname "file-acl-string" 'undef) + nil))) =20 ;; Simple functions using the `test' command. =20 ＠＠ -2825,40 +2825,43 ＠＠ =20 (with-current-buffer (tramp-get-connection-buffer v) (unwind-protect - (save-excursion - (save-restriction - ;; Activate narrowing in order to save BUFFER - ;; contents. Clear also the modification time; - ;; otherwise we might be interrupted by - ;; `verify-visited-file-modtime'. - (let ((buffer-undo-list t) - (buffer-read-only nil) - (mark (point))) - (clear-visited-file-modtime) - (narrow-to-region (point-max) (point-max)) - ;; We call `tramp-maybe-open-connection', in order - ;; to cleanup the prompt afterwards. - (tramp-maybe-open-connection v) - (widen) - (delete-region mark (point)) - (narrow-to-region (point-max) (point-max)) - ;; Now do it. - (if command - ;; Send the command. - (tramp-send-command v command nil t) ; nooutput - ;; Check, whether a pty is associated. - (unless (tramp-compat-process-get - (tramp-get-connection-process v) 'remote-tty) - (tramp-error - v 'file-error - "pty association is not supported for `%s'" name)))) - (let ((p (tramp-get-connection-process v))) - ;; Set query flag for this process. We ignore errors, - ;; because the process could have finished already. - (ignore-errors - (tramp-compat-set-process-query-on-exit-flag p t)) - ;; Return process. - p))) + ;; We catch this event. Otherwise, `start-process' could + ;; be called on the local host. + (catch 'suppress + (save-excursion + (save-restriction + ;; Activate narrowing in order to save BUFFER + ;; contents. Clear also the modification time; + ;; otherwise we might be interrupted by + ;; `verify-visited-file-modtime'. + (let ((buffer-undo-list t) + (buffer-read-only nil) + (mark (point))) + (clear-visited-file-modtime) + (narrow-to-region (point-max) (point-max)) + ;; We call `tramp-maybe-open-connection', in order + ;; to cleanup the prompt afterwards. + (tramp-maybe-open-connection v) + (widen) + (delete-region mark (point)) + (narrow-to-region (point-max) (point-max)) + ;; Now do it. + (if command + ;; Send the command. + (tramp-send-command v command nil t) ; nooutput + ;; Check, whether a pty is associated. + (unless (tramp-compat-process-get + (tramp-get-connection-process v) 'remote-tty) + (tramp-error + v 'file-error + "pty association is not supported for `%s'" name)))) + (let ((p (tramp-get-connection-process v))) + ;; Set query flag for this process. We ignore errors, + ;; because the process could have finished already. + (ignore-errors + (tramp-compat-set-process-query-on-exit-flag p t)) + ;; Return process. + p)))) =20 ;; Save exit. (if (string-match tramp-temp-buffer-name (buffer-name)) ＠＠ -3485,6 +3488,64 ＠＠ ;; Default file name handlers, we don't care. (t (tramp-run-real-handler operation args))))))) =20 +(defun tramp-sh-handle-inotify-add-watch (file-name aspect callback) + "Like `inotify-add-watch' for Tramp files." + (setq file-name (expand-file-name file-name)) + (unless (consp aspect) (setq aspect (cons aspect nil))) + (with-parsed-tramp-file-name file-name nil + (let* ((default-directory (file-name-directory file-name)) + (command (tramp-get-remote-inotifywait v)) + (aspect (mapconcat + (lambda (x) + (replace-regexp-in-string "-" "_" (symbol-name x))) + aspect ",")) + (p (and command + (start-file-process + "inotifywait" nil command "-mq" "-e" aspect localname)))) + (when (processp p) + (tramp-compat-set-process-query-on-exit-flag p nil) + (set-process-filter p 'tramp-sh-inotify-process-filter) + (tramp-set-connection-property p "inotify-callback" callback) + ;; Return the file-name vector as watch-descriptor. + (tramp-set-connection-property p "inotify-watch-descriptor" v))))) + +(defun tramp-sh-inotify-process-filter (proc string) + "Read output from \"inotifywait\" and add corresponding inotify events." + (tramp-message + (tramp-get-connection-property proc "vector" nil) 6 + (format "%s\n%s" proc string)) + (dolist (line (split-string string "[\n\r]+" 'omit-nulls)) + ;; Check, whether there is a problem. + (unless + (string-match + "^[^[:blank:]]+[[:blank:]]+\\([^[:blank:]]+\\)+\\([[:blank:]]+\\([^[:bla= nk:]]+\\)\\)?[[:blank:]]*$" line) + (tramp-error proc 'filewatch-error "%s" line)) + + (let* ((object + (list + (tramp-get-connection-property + proc "inotify-watch-descriptor" nil) + ;; Aspect symbols. We filter out MOVE and CLOSE, which + ;; are convenience macros. See INOTIFY(7). + (mapcar + (lambda (x) + (intern-soft (replace-regexp-in-string "_" "-" (downcase x)))) + (delete "MOVE" (delete "CLOSE" + (split-string (match-string 1 line) "," 'omit-nulls)))) + ;; We cannot gather any cookie value. So we return 0 as + ;; "don't know". + 0 (match-string 3 line))) + (callback + (tramp-get-connection-property proc "inotify-callback" nil)) + (event `(file-inotify ,object ,callback))) + + ;; Usually, we would add an Emacs event now. Unfortunately, + ;; `unread-command-events' does not accept several events at + ;; once. Therefore, we apply the callback directly. + ;(setq unread-command-events (cons event unread-command-events))))) + (let ((last-input-event event)) + (funcall callback object))))) + ;;; Internal Functions: =20 (defun tramp-maybe-send-script (vec script name) ＠＠ -4207,6 +4268,9 ＠＠ (tramp-message vec 2 "Couldn't find an inline transfer compress command"))))) =20 +(defvar tramp-gw-tunnel-method) +(defvar tramp-gw-socks-method) + (defun tramp-compute-multi-hops (vec) "Expands VEC according to `tramp-default-proxies-alist'. Gateway hops are already opened." ＠＠ -4267,10 +4331,11 ＠＠ (setq choices tramp-default-proxies-alist))))) =20 ;; Handle gateways. - (when (string-match - (format - "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method) - (tramp-file-name-method (car target-alist))) + (when (and tramp-gw-tunnel-method tramp-gw-socks-method + (string-match + (format + "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method) + (tramp-file-name-method (car target-alist)))) (let ((gw (pop target-alist)) (hop (pop target-alist))) ;; Is the method prepared for gateways? ＠＠ -5040,6 +5105,11 ＠＠ (tramp-message vec 5 "Finding a suitable `trash' command") (tramp-find-executable vec "trash" (tramp-get-remote-path vec)))) =20 +(defun tramp-get-remote-inotifywait (vec) + (with-tramp-connection-property vec "inotifywait" + (tramp-message vec 5 "Finding a suitable `inotifywait' command") + (tramp-find-executable vec "inotifywait" (tramp-get-remote-path vec) t= t))) + (defun tramp-get-remote-id (vec) (with-tramp-connection-property vec "id" (tramp-message vec 5 "Finding POSIX `id' command") diff -r 940dd66c22eb41fa9c9516709e8eaecc0ae4b9de -r a7fa04a0adfcf99eec9760f= 372f07fc7b784067d lisp/tramp.el --- a/lisp/tramp.el +++ b/lisp/tramp.el ＠＠ -1140,9 +1140,12 ＠＠ =20 ;;;###tramp-autoload (defun tramp-tramp-file-p (name) - "Return t if NAME is a string with Tramp file name syntax." + "Return t if NAME is a string with Tramp file name syntax. +It checks also, whether NAME is unibyte encoded." (save-match-data - (and (stringp name) (string-match tramp-file-name-regexp name)))) + (and (stringp name) + (string-equal name (string-as-unibyte name)) + (string-match tramp-file-name-regexp name)))) =20 (defun tramp-find-method (method user host) "Return the right method string to use. ＠＠ -1905,7 +1908,7 ＠＠ ;; Emacs 22+ only. 'set-file-times ;; Emacs 24+ only. - 'file-acl 'file-selinux-context + 'file-acl 'file-selinux-context 'inotify-add-watch 'set-file-acl 'set-file-selinux-context ;; XEmacs only. 'abbreviate-file-name 'create-file-buffer ＠＠ -3897,8 +3900,8 ＠＠ (mapconcat 'identity (or - ;; When `tramp-own-remote-path' is in `tramp-remote-path', the remote - ;; path is only set in the session cache + ;; When `tramp-own-remote-path' is in `tramp-remote-path', + ;; the remote path is only set in the session cache. (tramp-get-connection-property (tramp-get-connection-process v) "remote-path" nil) (tramp-get-connection-property v "remote-path" nil)) Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches