Mercurial > emacs
changeset 85126:9a6e9b6e4a76
Sync with Tramp 2.1.11.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Wed, 10 Oct 2007 04:55:30 +0000 |
| parents | d9578941757d |
| children | b98ea218eb70 |
| files | doc/misc/ChangeLog doc/misc/trampver.texi lisp/ChangeLog lisp/net/tramp.el lisp/net/trampver.el |
| diffstat | 5 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Wed Oct 10 01:14:25 2007 +0000 +++ b/doc/misc/ChangeLog Wed Oct 10 04:55:30 2007 +0000 @@ -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.
--- a/doc/misc/trampver.texi Wed Oct 10 01:14:25 2007 +0000 +++ b/doc/misc/trampver.texi Wed Oct 10 04:55:30 2007 +0000 @@ -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}
--- a/lisp/ChangeLog Wed Oct 10 01:14:25 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 10 04:55:30 2007 +0000 @@ -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.
--- a/lisp/net/tramp.el Wed Oct 10 01:14:25 2007 +0000 +++ b/lisp/net/tramp.el Wed Oct 10 04:55:30 2007 +0000 @@ -5695,7 +5695,7 @@ (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 @@ (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
--- a/lisp/net/trampver.el Wed Oct 10 01:14:25 2007 +0000 +++ b/lisp/net/trampver.el Wed Oct 10 04:55:30 2007 +0000 @@ -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)