[Emacs-diffs] /srv/bzr/emacs/trunk r109995: Sync with Tramp 2.2.6.

[Michael Albinus]

------------------------------------------------------------
revno: 109995
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-12 18:36:25 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el
  lisp/net/trampver.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-12 15:49:17 +0000
+++ b/lisp/ChangeLog    2012-09-12 16:36:25 +0000
@@ -1,3 +1,12 @@
+2012-09-12  Michael Albinus  <address@hidden>
+
+       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.
+
 2012-09-12  Martin Rudalics  <address@hidden>
 
        * emacs-lisp/debug.el (debugger-previous-window-height): New

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2012-08-20 14:06:06 +0000
+++ b/lisp/net/tramp.el 2012-09-12 16:36:25 +0000
@@ -3293,7 +3293,9 @@
       ;; 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)

=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el      2012-06-11 10:30:07 +0000
+++ b/lisp/net/trampver.el      2012-09-12 16:36:25 +0000
@@ -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)))