mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-08 15:35:02 +00:00
Code Issues Releases Activity

Fix Bug#22452

Browse Source 
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
Mark it as connected.

* lisp/net/tramp.el (tramp-handle-file-remote-p): Check also, if
connection property "connected" is set.  (Bug#22452)
This commit is contained in:
Michael Albinus 2016-01-28 13:37:58 +01:00
parent 8e5046a6e5
commit deae005667
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/net/tramp-adb.el
View File

@ -1250,7 +1250,10 @@ connection if a previous connection has died for some reason."
;; Read the expression.
(goto-char (point-min))
(read (current-buffer)))
":" 'omit-nulls))))))))
":" 'omit-nulls))
;; Mark it as connected.
(tramp-set-connection-property p "connected" t)))))))
(add-hook 'tramp-unload-hook
(lambda ()

6
lisp/net/tramp-gvfs.el
View File

@ -1617,7 +1617,11 @@ connection if a previous connection has died for some reason."
;; is marked with the fuse-mountpoint "/". We shall react.
(when (string-equal
(tramp-get-file-property vec "/" "fuse-mountpoint" "") "/")
(tramp-error vec 'file-error "FUSE mount denied")))))
(tramp-error vec 'file-error "FUSE mount denied"))
;; Mark it as connected.
(tramp-set-connection-property
(tramp-get-connection-process vec) "connected" t))))
;; In `tramp-check-cached-permissions', the connection properties
;; {uig,gid}-{integer,string} are used. We set them to their local

5
lisp/net/tramp-sh.el
View File

@ -5040,7 +5040,10 @@ connection if a previous connection has died for some reason."
target-alist (cdr target-alist)))
;; Make initial shell settings.
(tramp-open-connection-setup-interactive-shell p vec)))))
(tramp-open-connection-setup-interactive-shell p vec)
;; Mark it as connected.
(tramp-set-connection-property p "connected" t)))))
;; When the user did interrupt, we must cleanup.
(quit

5
lisp/net/tramp-smb.el
View File

@ -1914,7 +1914,10 @@ If ARGUMENT is non-nil, use it as argument for
;; character by character; if we send the string
;; at once, it is read painfully slow.
(tramp-set-connection-property p "smb-share" share)
(tramp-set-connection-property p "chunksize" 1))
(tramp-set-connection-property p "chunksize" 1)
;; Mark it as connected.
(tramp-set-connection-property p "connected" t))
;; Check for the error reason. If it was due to wrong
;; password, reestablish the connection. We cannot

3
lisp/net/tramp.el
View File

@ -3009,7 +3009,8 @@ User is always nil."
(when (tramp-tramp-file-p filename)
(let* ((v (tramp-dissect-file-name filename))
(p (tramp-get-connection-process v))
(c (and p (processp p) (memq (process-status p) '(run open)))))
(c (and p (processp p) (memq (process-status p) '(run open))
(tramp-get-connection-property p "connected" nil))))
;; We expand the file name only, if there is already a connection.
(with-parsed-tramp-file-name
(if c (expand-file-name filename) filename) nil