diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2012-09-12 18:36:25 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2012-09-12 18:36:25 +0200 |
| commit | fbbcaf1b249f7eba5ac53a3b380e1692ca1dbff9 (patch) | |
| tree | 9b9c8dc695320603c45972bd6dab6c236b0c074f /lisp/net | |
| parent | e210dac49f20de277b81d2298e6be8f98f8ac738 (diff) | |
| download | emacs-fbbcaf1b249f7eba5ac53a3b380e1692ca1dbff9.tar.gz emacs-fbbcaf1b249f7eba5ac53a3b380e1692ca1dbff9.tar.bz2 emacs-fbbcaf1b249f7eba5ac53a3b380e1692ca1dbff9.zip | |
Sync with Tramp 2.2.6.
* net/tramp.el (tramp-accept-process-output): Don't use
JUST-THIS-ONE in the XEmacs case.
* net/trampver.el: Update release number.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 4 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a17bbfa0d14..019ab1eef0f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3293,7 +3293,9 @@ for process communication also." ;; Under Windows XP, accept-process-output doesn't return ;; sometimes. So we add an additional timeout. (with-timeout ((or timeout 1)) - (accept-process-output proc timeout timeout-msecs (and proc t)))) + (if (featurep 'xemacs) + (accept-process-output proc timeout timeout-msecs) + (accept-process-output proc timeout timeout-msecs (and proc t))))) (tramp-message proc 10 "\n%s" (buffer-string)))) (defun tramp-check-for-regexp (proc regexp) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 499af730788..2d0a8e3d23d 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.6-pre" +(defconst tramp-version "2.2.6" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.6-pre is not fit for %s" + (format "Tramp 2.2.6 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) |