diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-12-14 19:30:01 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-12-14 19:30:01 +0100 |
| commit | c0c6cd2d5d7af82ddfd4d8d080d0aa8d7882d293 (patch) | |
| tree | 176900038c02b3fcc984969464e51ce4aeb3f138 /lisp/net/ange-ftp.el | |
| parent | 47a854bf24c8a36bf1e8ac32c8b5c9ebcba1d90a (diff) | |
| download | emacs-c0c6cd2d5d7af82ddfd4d8d080d0aa8d7882d293.tar.gz emacs-c0c6cd2d5d7af82ddfd4d8d080d0aa8d7882d293.tar.bz2 emacs-c0c6cd2d5d7af82ddfd4d8d080d0aa8d7882d293.zip | |
Add 'remote-file-error' for Tramp
* doc/lispref/errors.texi (Standard Errors): Add 'remote-file-error'.
* etc/NEWS: Mention 'remote-file-error'.
* lisp/net/ange-ftp.el (ftp-error): Add error condition
`remote-file-error'.
* lisp/net/tramp-cmds.el (tramp-cleanup-all-connections): Do not set
`tramp-locked'.
* lisp/net/tramp-compat.el (remote-file-error): Define if it
doesn't exist.
* lisp/net/tramp-sh.el (tramp-timeout-session): Check for "locked"
property.
(tramp-maybe-open-connection): Simplify.
* lisp/net/tramp.el (tramp-locked, tramp-locker): Remove them.
(tramp-file-name-handler): Do not set them.
(with-tramp-locked-connection): New defmacro.
(tramp-accept-process-output, tramp-send-string): Use it.
* src/fileio.c (Qremote_file_error): New error symbol.
* test/lisp/net/tramp-tests.el (tramp-test43-asynchronous-requests):
Adapt test. Remove :unstable tag.
Diffstat (limited to 'lisp/net/ange-ftp.el')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c627e1a088d..1922adb5480 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1080,7 +1080,7 @@ All HOST values should be in lower case.") (defvar ange-ftp-trample-marker) ;; New error symbols. -(define-error 'ftp-error nil 'file-error) ;"FTP error" +(define-error 'ftp-error nil '(remote-file-error file-error)) ;"FTP error" ;;; ------------------------------------------------------------ ;;; Enhanced message support. |