Mercurial > emacs
changeset 109993:2192a4648d21
Sync with Tramp 2.1.19.
* net/trampver.el: Update release number.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Thu, 26 Aug 2010 09:33:16 +0200 |
| parents | 640cdeb464c1 |
| children | 9ee2c87aa053 |
| files | lisp/ChangeLog lisp/net/tramp-uu.el lisp/net/tramp.el lisp/net/trampver.el |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Aug 25 23:31:34 2010 -0400 +++ b/lisp/ChangeLog Thu Aug 26 09:33:16 2010 +0200 @@ -1,3 +1,9 @@ +2010-08-26 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.1.19. + + * net/trampver.el: Update release number. + 2010-08-26 Chong Yidong <cyd@stupidchicken.com> * help.el (help-map): Bind `C-h P' to describe-package.
--- a/lisp/net/tramp-uu.el Wed Aug 25 23:31:34 2010 -0400 +++ b/lisp/net/tramp-uu.el Thu Aug 26 09:33:16 2010 +0200 @@ -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 <kai.grossjohann@gmx.net> ;; Keywords: comm, terminals
--- a/lisp/net/tramp.el Wed Aug 25 23:31:34 2010 -0400 +++ b/lisp/net/tramp.el Thu Aug 26 09:33:16 2010 +0200 @@ -8995,6 +8995,13 @@ ;; * 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: +;; <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>. +;; (Bug#6850) ;; Functions for file-name-handler-alist: ;; diff-latest-backup-file -- in diff.el
--- a/lisp/net/trampver.el Wed Aug 25 23:31:34 2010 -0400 +++ b/lisp/net/trampver.el Thu Aug 26 09:33:16 2010 +0200 @@ -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)