diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:29:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:29:37 -0700 |
| commit | 02c7d45d490dd28a1c4effa928f9a8b9373149b0 (patch) | |
| tree | 670652f24cf21779b201e11a55ebce64158fb39c /doc/lispref/files.texi | |
| parent | 0aaf14a441041fa8b5810ae0eec624011b53bb4c (diff) | |
| parent | 90bea37d466f47a65f3790b4bc46b11af9a4a27a (diff) | |
| download | emacs-02c7d45d490dd28a1c4effa928f9a8b9373149b0.tar.gz | |
Merge from origin/emacs-26
90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
af82d1f * etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31...
4a3aed2 Update Emacs Lisp Intro to match current behavior
21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
3257085 Fix previous commit
6d23525 Fix typos in several manuals (Bug#31610)
9188291 Add detailed documentation about lock files
e5471b2 Add commentary for subtle aspect of frame.el
Conflicts:
doc/lispintro/emacs-lisp-intro.texi
Diffstat (limited to 'doc/lispref/files.texi')
| -rw-r--r-- | doc/lispref/files.texi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index e36fdbe95bf..a692bb2f2b6 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -712,6 +712,7 @@ with-temp-buffer,, The Current Buffer}. @section File Locks @cindex file locks @cindex lock file +@cindex .#, lock file names When two users edit the same file at the same time, they are likely to interfere with each other. Emacs tries to prevent this situation @@ -720,8 +721,17 @@ modified. Emacs can then detect the first attempt to modify a buffer visiting a file that is locked by another Emacs job, and ask the user what to do. The file lock is really a file, a symbolic link with a special name, -stored in the same directory as the file you are editing. (On file -systems that do not support symbolic links, a regular file is used.) +stored in the same directory as the file you are editing. The name is +constructed by prepending @file{.#} to the filename of the buffer. +The target of the symbolic link will be of the form +@code{@var{user}@@@var{host}.@var{pid}:@var{boot}}, where @var{user} +is replaced with the current username (from @code{user-login-name}), +@var{host} with the name of the host where Emacs is running (from +@code{system-name}), @var{pid} with Emacs's process id, and @var{boot} +with the time since the last reboot. @code{:@var{boot}} is omitted if +the boot time is unavailable. (On file systems that do not support +symbolic links, a regular file is used instead, with contents of the +form @code{@var{user}@@@var{host}.@var{pid}:@var{boot}}.) When you access files using NFS, there may be a small probability that you and another user will both lock the same file simultaneously. |