From: Michael Albinus Date: Thu, 26 Aug 2010 07:33:16 +0000 (+0200) Subject: Sync with Tramp 2.1.19. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~234 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44ffae9672292775c5e60c4153cdda89795c728c;p=emacs.git Sync with Tramp 2.1.19. * net/trampver.el: Update release number. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 28bc8123501..cb2ea814c14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-08-26 Michael Albinus + + Sync with Tramp 2.1.19. + + * net/trampver.el: Update release number. + 2010-08-26 Chong Yidong * help.el (help-map): Bind `C-h P' to describe-package. diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index 4b64387a8ba..897a87b0134 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -1,7 +1,7 @@ ;;; tramp-uu.el --- uuencode in Lisp -;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Keywords: comm, terminals diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 052dc7d7575..d5d1606c617 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -8995,6 +8995,13 @@ Only works for Bourne-like shells." ;; * Try telnet+curl as new method. It might be useful for busybox, ;; without built-in uuencode/uudecode. ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'. +;; * I was wondering it it would be possible to use tramp even if I'm +;; actually using sshfs. But when I launch a command I would like +;; to get it executed on the remote machine where the files really +;; are. (Andrea Crotti) +;; * Run emerge on two remote files. Bug is described here: +;; . +;; (Bug#6850) ;; Functions for file-name-handler-alist: ;; diff-latest-backup-file -- in diff.el diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 471a344b860..a002ebebbf2 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,14 +30,14 @@ ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4; ;; should be changed only there. -(defconst tramp-version "2.1.19-pre" +(defconst tramp-version "2.1.19" "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 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.19-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) +(let ((x (if (or (>= emacs-major-version 22) (and (featurep 'xemacs) (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" (format "Tramp 2.1.19 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) (provide 'trampver)