diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2017-06-14 14:17:22 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2017-06-14 14:17:22 +0200 |
commit | 164fcc6f26e4a539f6cb1e4b7196ce5f93d06a53 (patch) | |
tree | 23b08f4be044bea2a34d69743bab1e2fc81ad90a /lisp/net/tramp-cache.el | |
parent | 5647c4a2c62054ad3dae3d6d83739b7cc4d10c9f (diff) | |
download | emacs-164fcc6f26e4a539f6cb1e4b7196ce5f93d06a53.tar.gz emacs-164fcc6f26e4a539f6cb1e4b7196ce5f93d06a53.tar.bz2 emacs-164fcc6f26e4a539f6cb1e4b7196ce5f93d06a53.zip |
Fix Bug#27315
* lisp/net/tramp-cache.el (tramp-cache-read-persistent-data):
New defvar.
(top): Use it.
* lisp/net/tramp.el (tramp-handle-file-name-case-insensitive-p):
Check for connected, not for connectable. (Bug#27315)
(tramp-process-actions):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
Use `tramp-cache-read-persistent-data'.
* test/lisp/net/tramp-tests.el (top): Set also
`tramp-cache-read-persistent-data'.
Diffstat (limited to 'lisp/net/tramp-cache.el')
-rw-r--r-- | lisp/net/tramp-cache.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 415cde2fc8a..ac5a9c45bbd 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -429,14 +429,16 @@ for all methods. Resulting data are derived from connection history." tramp-cache-data) res)) +;; 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. +;;;###tramp-autoload +(defvar tramp-cache-read-persistent-data (or init-file-user site-run-file) + "Whether to read persistent data at startup time.") + ;; Read persistent connection history. (when (and (stringp tramp-persistency-file-name) (zerop (hash-table-count tramp-cache-data)) - ;; 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)) + tramp-cache-read-persistent-data) (condition-case err (with-temp-buffer (insert-file-contents tramp-persistency-file-name) |