summaryrefslogtreecommitdiff
path: root/doc/emacs/files.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-06-02 10:29:37 -0700
committerGlenn Morris <rgm@gnu.org>2018-06-02 10:29:37 -0700
commit02c7d45d490dd28a1c4effa928f9a8b9373149b0 (patch)
tree670652f24cf21779b201e11a55ebce64158fb39c /doc/emacs/files.texi
parent0aaf14a441041fa8b5810ae0eec624011b53bb4c (diff)
parent90bea37d466f47a65f3790b4bc46b11af9a4a27a (diff)
downloademacs-02c7d45d490dd28a1c4effa928f9a8b9373149b0.tar.gz
emacs-02c7d45d490dd28a1c4effa928f9a8b9373149b0.tar.bz2
emacs-02c7d45d490dd28a1c4effa928f9a8b9373149b0.zip
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/emacs/files.texi')
-rw-r--r--doc/emacs/files.texi9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 79420878e85..7043bdc0688 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -769,13 +769,16 @@ file.
@findex ask-user-about-lock
@cindex locking files
+@cindex .#, lock file names
+@cindex file locking
When you make the first modification in an Emacs buffer that is
visiting a file, Emacs records that the file is @dfn{locked} by you.
(It does this by creating a specially-named symbolic link@footnote{If
your file system does not support symbolic links, a regular file is
-used.} with special contents in the same directory.) Emacs removes the lock
-when you save the changes. The idea is that the file is locked
-whenever an Emacs buffer visiting it has unsaved changes.
+used.} with special contents in the same directory. @xref{File
+Locks,,, elisp} for more details.) Emacs removes the lock when you
+save the changes. The idea is that the file is locked whenever an
+Emacs buffer visiting it has unsaved changes.
@vindex create-lockfiles
You can prevent the creation of lock files by setting the variable