[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106169: Sync with Tramp 2.2.3.
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106169: Sync with Tramp 2.2.3. |
Date: |
Sun, 23 Oct 2011 17:59:54 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106169
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2011-10-23 17:59:54 +0200
message:
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.
modified:
lisp/ChangeLog
lisp/net/tramp-cache.el
lisp/net/trampver.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-23 03:38:23 +0000
+++ b/lisp/ChangeLog 2011-10-23 15:59:54 +0000
@@ -1,3 +1,12 @@
+2011-10-23 Michael Albinus <address@hidden>
+
+ 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 <address@hidden>
* files.el (toggle-read-only): Remove obsolete comment about
=== modified file 'lisp/net/tramp-cache.el'
--- a/lisp/net/tramp-cache.el 2011-06-21 19:51:26 +0000
+++ b/lisp/net/tramp-cache.el 2011-10-23 15:59:54 +0000
@@ -383,7 +383,8 @@
;; 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)
=== modified file 'lisp/net/trampver.el'
--- a/lisp/net/trampver.el 2011-08-04 00:58:07 +0000
+++ b/lisp/net/trampver.el 2011-10-23 15:59:54 +0000
@@ -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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106169: Sync with Tramp 2.2.3.,
Michael Albinus <=