Sync with Tramp 2.2.8.

* net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
* net/tramp-cache.el (tramp-cache-print): Use `tramp-compat-funcall'.
* net/trampver.el: Update release number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49cb49dd8930b6a6dabe9cc1c38395920ae6b2a5..14d6f8503f62f89b201ad72e914afc90838bdc28 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-02  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.2.8.
+
+       * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
+       * net/tramp-cache.el (tramp-cache-print): Use `tramp-compat-funcall'.
+       * net/trampver.el: Update release number.
+
 2013-10-01  Jan Djärv  <jan.h.d@swipnet.se>
 
        * term/ns-win.el (ns-initialize-window-system): Set locale-coding-system

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 7407f83e92b319b61b73a385d8998246b8838ca1..ba7cf7a06ef5b86cdd7902a39099f3e729589a0b 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -291,11 +291,14 @@ KEY identifies the connection, it is either a process or a vector."
           (when (vectorp key)
             (dotimes (i (length key))
               (when (stringp (aref key i))
-                (aset key i (funcall 'substring-no-properties (aref key i))))))
+                (aset key i
+                      (tramp-compat-funcall
+                       'substring-no-properties (aref key i))))))
           (when (stringp key)
-            (setq key (funcall 'substring-no-properties key)))
+            (setq key (tramp-compat-funcall 'substring-no-properties key)))
           (when (stringp value)
-            (setq value (funcall 'substring-no-properties value))))
+            (setq value
+                  (tramp-compat-funcall 'substring-no-properties value))))
         ;; Dump.
         (let ((tmp (format
                     "(%s %s)"

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 5015929534dec5bfa62d8be715cfa612238790f0..e23ab797c22c8be3d0a6169a5da49e2d8bff50e4 100644 (file)
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -194,7 +194,7 @@ This includes password cache, file cache, connection cache, buffers."
 
        'tramp-load-report-modules      ; pre-hook
        'tramp-append-tramp-buffers     ; post-hook
-       (funcall
+       (tramp-compat-funcall
        (if (functionp 'propertize) 'propertize 'progn)
        "\n" 'display "\
 Enter your bug report in this message, including as much detail
@@ -361,7 +361,7 @@ the debug buffer(s).")
              (kill-buffer nil)
              (switch-to-buffer curbuf)
              (goto-char (point-max))
-             (insert (propertize "\n" 'display "\n\
+             (insert (tramp-compat-funcall 'propertize "\n" 'display "\n\
 This is a special notion of the `gnus/message' package.  If you
 use another mail agent (by copying the contents of this buffer)
 please ensure that the buffers are attached to your email.\n\n"))

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 0e54cd60d98120e332ff524e5b91d3a8ddfb0459..8fc05872ca15706d6ecb6d7947c409361161c832 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.8-pre"
+(defconst tramp-version "2.2.8"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.8-pre is not fit for %s"
+          (format "Tramp 2.2.8 is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))