Sync with Tramp 2.2.11.

* net/tramp-compat.el (top): Require cl-macs for Emacs 22.
Make an alias for `default-toplevel-value' if it doesn't exist.

* net/tramp-smb.el (tramp-smb-handle-copy-directory):
Use `tramp-compat-delete-directory'.

* net/trampver.el: Update release number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d98f81b0d0cbd0504cf03efe9d9e8cab63d6157..74517345064ca2661032a081f17ff6db959ca945 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.2.11.
+
+       * net/tramp-compat.el (top): Require cl-macs for Emacs 22.
+       Make an alias for `default-toplevel-value' if it doesn't exist.
+
+       * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+       Use `tramp-compat-delete-directory'.
+
+       * net/trampver.el: Update release number.
+
 2014-12-29  Filipp Gunbin  <fgunbin@fastmail.fm>
 
        * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index de63d8c7c7ac1f538143361c8212a1784960a7af..62c1501a3de1831d338b680c779dff0571bc1c3a 100644 (file)
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -35,6 +35,11 @@
 
 (eval-and-compile
 
+  ;; GNU Emacs 22.
+  (unless (fboundp 'ignore-errors)
+    (load "cl" 'noerror)
+    (load "cl-macs" 'noerror))
+
   ;; Some packages must be required for XEmacs, because we compile
   ;; with -no-autoloads.
   (when (featurep 'xemacs)
@@ -586,6 +591,10 @@ and replace a sub-expression, e.g.
        (setq matches (cons (substring string start l) matches)) ; leftover
        (apply #'concat (nreverse matches))))))
 
+;; `default-toplevel-value' has been declared in Emacs 24.
+(unless (fboundp 'default-toplevel-value)
+  (defalias 'default-toplevel-value 'symbol-value))
+
 (add-hook 'tramp-unload-hook
          (lambda ()
            (unload-feature 'tramp-loaddefs 'force)

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 3d48f47e58e8c93b4593f20fc25a442e520a4ff5..8f6a10221b6d2b78c4d345d9942c0a4430118255 100644 (file)
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -513,7 +513,7 @@ pass to the OPERATION."
                ;; Reset the transfer process properties.
                (tramp-set-connection-property v "process-name" nil)
                (tramp-set-connection-property v "process-buffer" nil)
-               (when t1 (delete-directory tmpdir 'recurse))))
+               (when t1 (tramp-compat-delete-directory tmpdir 'recurse))))
 
            ;; Handle KEEP-DATE argument.
            (when keep-date

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 065c3f33ebec92d93c7fd43d50a564c1b8698bca..f1c36b8603e2276185086bdcd6722e2f7342d12f 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.11-pre"
+(defconst tramp-version "2.2.11-24.5"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.11-pre is not fit for %s"
+          (format "Tramp 2.2.11-24.5 is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))