procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync with Tramp 2.2.3.

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

* net/trampver.el: Update release number.
This commit is contained in:
Michael Albinus 2011-10-23 17:59:54 +02:00
parent da97a9e66a
commit 09388e760d
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -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

3
lisp/net/tramp-cache.el
View file

@ -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)

4
lisp/net/trampver.el
View file

@ -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)))