diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2011-10-23 17:59:54 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2011-10-23 17:59:54 +0200 |
| commit | 09388e760d7b1683aa5ee2684d246a9bec0c0b0e (patch) | |
| tree | 572a6524dbd69c75803fb2436dd190a73a7d6c53 /lisp/net | |
| parent | da97a9e66a0f2cd705d26cc2c5bb21f810e892f1 (diff) | |
| download | emacs-09388e760d7b1683aa5ee2684d246a9bec0c0b0e.tar.gz | |
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.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-cache.el | 3 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 9397025cb60..b35ca3bbd18 100644 --- 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 5492441ac77..fc0c936c407 100644 --- 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))) |