Sync with Tramp 2.2.3.

* net/tramp-cache.el (top): Pacify byte-compiler using
`init-file-user' and `site-run-file'.

* net/trampver.el: Update release number.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09e2e7d..8ceb361 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-23  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.2.3.
+
+       * net/tramp-cache.el (top): Pacify byte-compiler using
+       `init-file-user' and `site-run-file'.
+
+       * net/trampver.el: Update release number.
+
 2011-10-23  Chong Yidong  <cyd@gnu.org>
 
        * files.el (toggle-read-only): Remove obsolete comment about

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 9397025..b35ca3b 100644 (file)
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -383,7 +383,8 @@ for all methods.  Resulting data are derived from connection history."
           ;; When "emacs -Q" has been called, both variables are nil.
           ;; We do not load the persistency file then, in order to
           ;; have a clean test environment.
-          (or init-file-user site-run-file))
+          (or (and (boundp 'init-file-user) (symbol-value 'init-file-user))
+              (and (boundp 'site-run-file) (symbol-value 'site-run-file))))
   (condition-case err
       (with-temp-buffer
        (insert-file-contents tramp-persistency-file-name)

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