diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-07-08 21:13:40 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-07-08 21:13:40 +0200 |
| commit | a6a92e3ac55b4a07f3b91dffecc28a89c2b5dbf2 (patch) | |
| tree | d2820313d3076143011ab5c4fbe3b42282465baf /lisp/userlock.el | |
| parent | 274e71f5cc33834a08e7bd24418553198cb01f34 (diff) | |
| download | emacs-a6a92e3ac55b4a07f3b91dffecc28a89c2b5dbf2.tar.gz | |
Code cleanup wrt file locks
* lisp/files.el (make-lock-file-name): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `make-lock-file-name'.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-lock-file-name'.
(tramp-handle-unlock-file): Call `userlock--handle-unlock-error'
in case of error.
* src/buffer.c (Frestore_buffer_modified_p):
* src/editfns.c (Freplace_buffer_contents):
* src/fileio.c (Finsert_file_contents, write_region): Call Funlock_file.
* src/filelock.c (unlock_file): Rename from unlock_file_body.
Remove the other declarations of unlock_file. Move file name
handler check to ...
(Funlock_file): ... here. Adapt argument numbers. Call
unlock_file wrapped by internal_condition_case.
(Flock_file): Adapt argument numbers.
(unlock_all_files, Funlock_buffer, unlock_buffer): Call Funlock_file.
* src/lisp.h (unlock_file): Remove.
Diffstat (limited to 'lisp/userlock.el')
| -rw-r--r-- | lisp/userlock.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/userlock.el b/lisp/userlock.el index 4a758153189..38aaf6aec23 100644 --- a/lisp/userlock.el +++ b/lisp/userlock.el @@ -230,7 +230,7 @@ to get the latest version of the file, then make the change again." (display-warning '(unlock-file) ;; There is no need to explain that this is an unlock error because - ;; ERR is a `file-error' condition, which explains this. + ;; ERROR is a `file-error' condition, which explains this. (message "%s, ignored" (error-message-string error)) :warning)) |