From 311dd93fa2834dfcda92b0a80f41eaba54d0b632 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 10 Oct 2007 04:55:30 +0000 Subject: [PATCH] Sync with Tramp 2.1.11. --- doc/misc/ChangeLog | 6 ++++++ doc/misc/trampver.texi | 4 ++-- lisp/ChangeLog | 9 +++++++++ lisp/net/tramp.el | 5 +++-- lisp/net/trampver.el | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 056ad379127..364b2796ac0 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2007-10-10 Michael Albinus + + Sync with Tramp 2.1.11. + + * trampver.texi: Update release number. + 2007-10-06 Michael Albinus * tramp.texi (External packages): New section. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 4ed196a80f0..179af979c06 100644 --- 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 0161024abb5..8bf8c4a9342 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2007-10-10 Michael Albinus + + 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 * follow.el: Require easymenu. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 26846f562f5..c8b2a72aad0 100644 --- 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 c8da0add016..a83d81966a8 100644 --- 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) -- 2.39.5