commit/tramp: albinus: Sync with Tramp 2.2 upstream.

1 new commit in tramp: https://bitbucket.org/xemacs/tramp/commits/8342bcc6852d/ changeset: 8342bcc6852d user: albinus date: 2013-01-30 19:56:50 summary: Sync with Tramp 2.2 upstream. affected #: 4 files diff -r a7fa04a0adfcf99eec9760f372f07fc7b784067d -r 8342bcc6852d808c2fb817fbad320ffbbb19d7c7 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-30 Michael Albinus <michael.albinus(a)gmx.de&gt; + + Sync with Tramp 2.2 upstream. + 2013-01-29 Michael Albinus <michael.albinus(a)gmx.de&gt; * Makefile (LISPFILES): New variable. diff -r a7fa04a0adfcf99eec9760f372f07fc7b784067d -r 8342bcc6852d808c2fb817fbad320ffbbb19d7c7 lisp/ChangeLog --- a/lisp/ChangeLog +++ b/lisp/ChangeLog ＠＠ -1,3 +1,20 ＠＠ +2013-01-30 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * tramp.el (tramp-tramp-file-p): Comment check for + `string-as-unibyte'. The function does not exist on XEmacs, and + likely we need another approach. + + * tramp-sh.el (tramp-compute-multi-hops): Check, whether + `tramp-gw-*' variables are bound. + +2013-01-30 Michael Albinus <michael.albinus(a)gmx.de&gt; + + * tramp.el (tramp-process-connection-type): Fix docstring. + (tramp-completion-reread-directory-timeout): Fix type. + (tramp-connection-min-time-diff): New defcustom. + + * tramp-sh.el (tramp-maybe-open-connection): Use it. + 2013-01-29 Michael Albinus <michael.albinus(a)gmx.de&gt; * tramp-sh.el (tramp-sh-handle-start-file-process): Catch diff -r a7fa04a0adfcf99eec9760f372f07fc7b784067d -r 8342bcc6852d808c2fb817fbad320ffbbb19d7c7 lisp/tramp-sh.el --- a/lisp/tramp-sh.el +++ b/lisp/tramp-sh.el ＠＠ -2827,20 +2827,20 ＠＠ (unwind-protect ;; 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. + (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. + (catch 'suppress (tramp-maybe-open-connection v) (widen) (delete-region mark (point)) ＠＠ -2865,7 +2865,7 ＠＠ ;; Save exit. (if (string-match tramp-temp-buffer-name (buffer-name)) - (progn + (ignore-errors (set-process-buffer (tramp-get-connection-process v) nil) (kill-buffer (current-buffer))) (set-buffer-modified-p bmp)) ＠＠ -4331,7 +4331,7 ＠＠ (setq choices tramp-default-proxies-alist))))) ;; Handle gateways. - (when (and tramp-gw-tunnel-method tramp-gw-socks-method + (when (and (boundp 'tramp-gw-tunnel-method) (boundp 'tramp-gw-socks-method) (string-match (format "^\\(%s\\|%s\\)$" tramp-gw-tunnel-method tramp-gw-socks-method) ＠＠ -4416,7 +4416,7 ＠＠ (car tramp-current-connection))) (> (tramp-time-diff (current-time) (cdr tramp-current-connection)) - 5)) + (or tramp-connection-min-time-diff 0))) (throw 'suppress 'suppress)) ;; If too much time has passed since last command was sent, look diff -r a7fa04a0adfcf99eec9760f372f07fc7b784067d -r 8342bcc6852d808c2fb817fbad320ffbbb19d7c7 lisp/tramp.el --- a/lisp/tramp.el +++ b/lisp/tramp.el ＠＠ -1018,11 +1018,25 ＠＠ ;; for an override of the system default. (defcustom tramp-process-connection-type t "Overrides `process-connection-type' for connections from Tramp. -Tramp binds process-connection-type to the value given here before +Tramp binds `process-connection-type' to the value given here before opening a connection to a remote host." :group 'tramp :type '(choice (const nil) (const t) (const pty))) +(defcustom tramp-connection-min-time-diff 5 + "Defines seconds between two consecutive connection attempts. +This is necessary as self defense mechanism, in order to avoid +yo-yo connection attempts when the remote host is unavailable. + +A value of 0 or `nil' suppresses this check. This might be +necessary, when several out-of-order copy operations are +performed, or when several asynchronous processes will be started +in a short time frame. In those cases it is recommended to +let-bind this variable." +:group 'tramp +:version "24.4" +:type '(choice (const nil) integer)) + (defcustom tramp-completion-reread-directory-timeout 10 "Defines seconds since last remote command before rereading a directory. A remote directory might have changed its contents. In order to ＠＠ -1033,7 +1047,7 ＠＠ would require an immediate reread during filename completion, `nil' means to use always cached values for the directory contents." :group 'tramp -:type '(choice (const nil) integer)) +:type '(choice (const nil) (const t) integer)) ;;; Internal Variables: ＠＠ -1144,7 +1158,7 ＠＠ It checks also, whether NAME is unibyte encoded." (save-match-data (and (stringp name) - (string-equal name (string-as-unibyte name)) +; (string-equal name (string-as-unibyte name)) (string-match tramp-file-name-regexp name)))) (defun tramp-find-method (method user host) 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