Sync with Tramp 2.1.11.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 056ad379127b5366689ce562e86065dc0212e16c..364b2796ac00c4f977e4b8accf9c37335d3a0ec6 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-10  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.1.11.
+
+       * trampver.texi: Update release number.
+
 2007-10-06  Michael Albinus  <michael.albinus@gmx.de>
 
        * tramp.texi (External packages): New section.

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 4ed196a80f05321a0c75242bc868c6c87b5dd74c..179af979c0631febac8ea0fdc931e999052026ab 100644 (file)
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -4,12 +4,12 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.1.11-pre
+@set trampver 2.1.11
 
 @c Other flags from configuration
 @set instprefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
-@set infodir /usr/local/info
+@set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
 @set tramp @sc{tramp}

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0161024abb5e30a683aff799fa827a2f18ebf35b..8bf8c4a9342d66435d6e5fd4b869cd50c462efa8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-10  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.1.11.
+
+       * net/tramp.el (tramp-open-connection-setup-interactive-shell):
+       Pacify byte compiler.
+
+       * net/trampver.el: Update release number.
+
 2007-10-09  Juanma Barranquero  <lekktu@gmail.com>
 
        * follow.el: Require easymenu.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 26846f562f5b822bcb9dafb2f309c97204120970..c8b2a72aad0fb847e2597ca0b77500d088d1b68e 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5695,7 +5695,7 @@ process to set up.  VEC specifies the connection."
     (if (featurep 'mule)
        ;; Use MULE to select the right EOL convention for communicating
        ;; with the process.
-       (let* ((cs (or (process-coding-system proc)
+       (let* ((cs (or (funcall (symbol-function 'process-coding-system) proc)
                       (cons 'undecided 'undecided)))
               cs-decode cs-encode)
          (when (symbolp cs) (setq cs (cons cs cs)))
@@ -5708,7 +5708,8 @@ process to set up.  VEC specifies the connection."
          (when (search-forward "\r" nil t)
            (setq cs-decode (tramp-coding-system-change-eol-conversion
                             cs-decode 'dos)))
-         (set-buffer-process-coding-system cs-decode cs-encode))
+         (funcall (symbol-function 'set-buffer-process-coding-system)
+                  cs-decode cs-encode))
       ;; Look for ^M and do something useful if found.
       (when (search-forward "\r" nil t)
        ;; We have found a ^M but cannot frob the process coding system

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index c8da0add0166c93dafc0b598e336800ff048d348..a83d81966a8adadeb9ca3b004b5cfc844304b800 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,14 +30,14 @@
 ;; "autoconf && ./configure" to change them.  (X)Emacs version check is defined
 ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there.
 
-(defconst tramp-version "2.1.11-pre"
+(defconst tramp-version "2.1.11"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
 ;; Check for (X)Emacs version.
-(let ((x (if (or (< emacs-major-version 21)    (and (featurep 'xemacs)      (< emacs-minor-version 4)))    (format "Tramp 2.1.11-pre is not fit for %s"            (when (string-match "^.*$" (emacs-version))       (match-string 0 (emacs-version))))    "ok")))
+(let ((x (if (or (< emacs-major-version 21)    (and (featurep 'xemacs)      (< emacs-minor-version 4)))    (format "Tramp 2.1.11 is not fit for %s"        (when (string-match "^.*$" (emacs-version))       (match-string 0 (emacs-version))))    "ok")))
   (unless (string-match "\\`ok\\'" x) (error x)))
 
 (provide 'trampver)